diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 09:27:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 09:27:10 -0700 |
commit | 6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8 (patch) | |
tree | 33e4072d5539741e775788eb7dd0ffcf84208d3b /arch/arm | |
parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
parent | m68knommu: include sched.h in ColdFire/SPI driver (diff) | |
download | linux-dev-6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8.tar.xz linux-dev-6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: include sched.h in ColdFire/SPI driver
m68knommu: formatting of pointers in printk()
m68knommu: arch/m68k/include/asm/ide.h fix for nommu
Diffstat (limited to 'arch/arm')
0 files changed, 0 insertions, 0 deletions