aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/Kbuild
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-27 10:03:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-27 10:03:00 -0700
commit7a82323da3d21ea59a0509569fc5c7bc5aa7eed7 (patch)
treee1831a744561fed3a0316162d702d58fea9c85e9 /include/asm-sparc/Kbuild
parentMerge branch 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm (diff)
parentavr32: some mmc/sd cleanups (diff)
downloadlinux-dev-7a82323da3d21ea59a0509569fc5c7bc5aa7eed7.tar.xz
linux-dev-7a82323da3d21ea59a0509569fc5c7bc5aa7eed7.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: avr32: some mmc/sd cleanups include/video/atmel_lcdc.h must #include <linux/workqueue.h> avr32: allow system timer to share interrupt to make OProfile work drivers/misc/atmel-ssc.c: Removed duplicated include avr32: Add platform data for AC97C platform device avr32: clean up mci platform code fix avr32 build errors
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions