diff options
author | 2012-02-13 23:25:44 +0000 | |
---|---|---|
committer | 2012-02-13 23:25:44 +0000 | |
commit | a5368e770c9ec58b9d18378844c149df8513e7b8 (patch) | |
tree | 2dc0953afd7f54f3269486fc0edbb41cd9cf804e /arch/arm/mach-omap2 | |
parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/... (diff) | |
parent | ARM: at91: drop ide driver in favor of the pata one (diff) | |
download | linux-a5368e770c9ec58b9d18378844c149df8513e7b8.tar.gz linux-a5368e770c9ec58b9d18378844c149df8513e7b8.tar.bz2 linux-a5368e770c9ec58b9d18378844c149df8513e7b8.zip |
Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
* 'at91-fixes' of git://github.com/at91linux/linux-at91:
ARM: at91: drop ide driver in favor of the pata one
pata/at91: use newly introduced SMC accessors
ARM: at91: add accessor to manage SMC
ARM: at91:rtc/rtc-at91sam9: ioremap register bank
ARM: at91: USB AT91 gadget registration for module
Diffstat (limited to 'arch/arm/mach-omap2')
0 files changed, 0 insertions, 0 deletions