summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-09-10 23:20:25 +0200
committerArnd Bergmann <arnd@arndb.de>2011-09-10 23:20:25 +0200
commit1f51b001cccf3a16b9191de3dc67c58689cc44d6 (patch)
tree627bdd0a3b1f49f267f17cbe51da08ecde07e0ee /arch
parentARM: cns3xxx: Fix newly introduced warnings in the PCIe code (diff)
parentMerge branches 'non_hwmod_compliant_fix_3.1rc', 'omap3_clock_fixes_3.1rc', 'o... (diff)
parentARM: davinci: fix cache flush build error (diff)
downloadlinux-1f51b001cccf3a16b9191de3dc67c58689cc44d6.tar.xz
linux-1f51b001cccf3a16b9191de3dc67c58689cc44d6.zip
Merge branches 'cns3xxx/fixes', 'omap/fixes' and 'davinci/fixes' into fixes