summaryrefslogtreecommitdiff
path: root/drivers/pps
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-21 23:43:54 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-21 23:43:54 +0400
commit881bcabbde8bc13854a2cb30847abe181d31c5fd (patch)
tree4903428777c03b76d8f2b6cdc782098213300126 /drivers/pps
parente60b9a0346ee08af4715ee5b2d82f705fbe6e309 (diff)
parentf25e918e3546477948be999c3a7d56b316d74e4b (diff)
downloadlinux-881bcabbde8bc13854a2cb30847abe181d31c5fd.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Setup CROSS_COMPILE at the top m68k: Correct the Atari ALLOWINT definition m68k/video: Create <asm/vga.h> m68k: Make sure {read,write}s[bwl]() are always defined m68k/mm: Port OOM changes to do_page_fault() scsi/atari: Make more functions static scsi/atari: Revive "atascsi=" setup option net/ariadne: Improve debug prints m68k/atari: Change VME irq numbers from unsigned long to unsigned int m68k/amiga: Use arch_initcall() for registering platform devices m68k/amiga: Add error checks when registering platform devices m68k/amiga: Mark z_dev_present() __init m68k: Remove unused MAX_NOINT_IPL definition
Diffstat (limited to 'drivers/pps')
0 files changed, 0 insertions, 0 deletions