From: Wolfgang Denk <wd@denx.de>
Date: Mon, 30 Apr 2012 16:19:28 +0000 (+0200)
Subject: Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
X-Git-Tag: v2012.07-rc1~148
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0a6deb3251a68b5be640ab1b848ca67e906b75ce;p=oweals%2Fu-boot.git

Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
  lin_gadget: use common linux/compat.h
  linux/compat.h: rename from linux/mtd/compat.h
  lin_gadget: use common mdelay
  gunzip: rename z{alloc, free} to gz{alloc, free}
  fs/fat: align disk buffers on cache line to enable DMA and cache
  part_dos: align disk buffers on cache line to enable DMA and cache
---

0a6deb3251a68b5be640ab1b848ca67e906b75ce