summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-10 04:48:27 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-10 04:48:27 +0200
commitbbf5e9743fd6c9b4ef8a34db8a9502baf4191524 (patch)
treef84832df4429178ba9da41b2876d7ae4840f62ea /drivers/ide
parentARM: tegra: fix compilation error due to mach/hardware.h removal (diff)
parentMerge branch 'omap/fixes-for-3.1' into fixes (diff)
downloadlinux-bbf5e9743fd6c9b4ef8a34db8a9502baf4191524.tar.xz
linux-bbf5e9743fd6c9b4ef8a34db8a9502baf4191524.zip
Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc
* 'fixes' of git://git.linaro.org/people/arnd/arm-soc: ARM: mach-ux500: enable fix for ARM errata 754322 ARM: OMAP: musb: Remove a redundant omap4430_phy_init call in usb_musb_init ARM: OMAP: Fix i2c init for twl4030 ARM: OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1
Diffstat (limited to 'drivers/ide')
0 files changed, 0 insertions, 0 deletions