path: root/arch/microblaze/kernel
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-06 18:28:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-06 18:28:12 -0800
commit356b95424cfb456e14a59eaa579422ce014c424b (patch)
treec0478479041f82ccd7a95157dddf2fd2d59ad8c5 /arch/microblaze/kernel
parent770e1b035dcb6ec3f8ee69dda0815dd1e220a683 (diff)
parent3bd9e50b4297b0d85bb86a8f2ade941c0f9c21fd (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (21 commits) m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac m68k/serial: Remove references to obsolete serial config options m68k/net: Remove obsolete IRQ_FLG_* users m68k: Don't comment out syscalls used by glibc m68k/atari: Move declaration of atari_SCC_reset_done to header file m68k/serial: Remove references to obsolete CONFIG_SERIAL167 m68k/hp300: Export hp300_ledstate m68k: Initconst section fixes m68k/mac: cleanup macro case mac_scsi: fix mac_scsi on some powerbooks m68k/mac: fix powerbook 150 adb_type m68k/mac: fix baboon irq disable and shutdown m68k/mac: oss irq fixes m68k/mac: fix nubus slot irq disable and shutdown m68k/mac: enable via_alt_mapping on performa 580 m68k/mac: cleanup forward declarations m68k/mac: cleanup mac_irq_pending m68k/mac: cleanup mac_clear_irq m68k/mac: early console m68k/mvme16x: Add support for EARLY_PRINTK ... Fix up trivial conflict in arch/m68k/Kconfig.debug due to new EARLY_PRINTK config option addition clashing with movement of the BOOTPARAM options.
Diffstat (limited to 'arch/microblaze/kernel')
0 files changed, 0 insertions, 0 deletions