diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2012-08-23 17:02:42 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-23 17:02:42 +0200 |
| commit | 1e72fe1fca4490474984d6356bbf66e2daa89f73 (patch) | |
| tree | 12d95820cbb2083a6c78cfe550a0f9b20b1246eb /arch/arm/mach-s3c24xx/include/mach/dma.h | |
| parent | Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes (diff) | |
| parent | ARM: dts: imx51-babbage: fix esdhc cd/wp properties (diff) | |
| download | linux-dev-1e72fe1fca4490474984d6356bbf66e2daa89f73.tar.xz linux-dev-1e72fe1fca4490474984d6356bbf66e2daa89f73.zip | |
Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
* 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: dts: imx51-babbage: fix esdhc cd/wp properties
ARM: imx6: spin the cpu until hardware takes it down
ARM i.MX6q: Add virtual 1/3.5 dividers in the LDB clock path
Also updates to Linux 3.6-rc2
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c24xx/include/mach/dma.h')
0 files changed, 0 insertions, 0 deletions