Linus Torvalds 356b95424c 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.		2012-01-06 18:28:12 -08:00
..
accessibility
acpi	pstore: pass reason to backend write callback	2011-11-17 13:13:29 -08:00
amba	ARM: amba: Auto-generate AMBA driver module aliases during modpost	2011-11-22 10:58:30 +00:00
ata	pata_of_platform: Add missing CONFIG_OF_IRQ dependency.	2011-12-22 15:00:32 -05:00
atm	atm: eliminate atm_guess_pdu2truesize()	2011-11-26 16:40:30 -05:00
auxdisplay
base	driver-core/cpu: Expose hotpluggability to the rest of the kernel	2011-12-11 10:32:20 -08:00
bcma	bcma: extract revision and TX power IDs from SPROM	2011-12-13 15:47:41 -05:00
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2012-01-06 18:28:12 -08:00
bluetooth	Bluetooth: Add support for BCM20702A0 [0a5c:21e3]	2011-12-22 14:20:03 -02:00
cdrom
char	Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2012-01-06 18:03:30 -08:00
clk
clocksource	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2012-01-06 18:15:25 -08:00
connector
cpufreq	Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip	2011-12-19 19:23:15 +01:00
cpuidle
crypto	Merge git://github.com/herbertx/crypto	2011-11-25 21:55:07 -08:00
dca
devfreq
dio
dma	Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2012-01-06 18:03:30 -08:00
edac	Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-01-06 15:02:37 -08:00
eisa
firewire
firmware	Merge branch 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux	2012-01-06 18:03:02 -08:00
gpio	Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2012-01-06 18:03:30 -08:00
gpu	drm/radeon/kms/atom: fix possible segfault in pm setup	2012-01-03 09:17:16 +00:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2011-12-02 08:25:46 -08:00
hv
hwmon	Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-01-06 13:58:21 -08:00
hwspinlock
i2c	i2c-eg20t: correct the driver init order of pch_i2c_probe()	2011-12-18 11:46:42 +00:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide	2011-11-18 22:04:12 -02:00
idle
ieee802154	net: remove NETIF_F_NO_CSUM feature bit	2011-11-16 17:43:12 -05:00
infiniband	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
input	Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2012-01-06 18:03:30 -08:00
iommu	Merge branch 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-01-06 07:54:53 -08:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-02 13:49:21 -05:00
leds
lguest	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-01-06 17:22:09 -08:00
macintosh	Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip	2011-12-19 19:23:15 +01:00
mca
md	md/bitmap: It is OK to clear bits during recovery.	2011-12-23 09:57:48 +11:00
media	gspca: Fix falling back to lower isoc alt settings	2011-12-31 11:53:58 -08:00
memstick
message
mfd	mfd: Include linux/io.h to jz4740-adc	2011-12-20 18:53:26 +01:00
misc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-02 13:49:21 -05:00
mmc	Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2012-01-06 18:03:30 -08:00
mtd	mtd: plat_ram: call mtd_device_register only if partition data exists	2011-12-19 11:13:52 +00:00
net	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2012-01-06 18:28:12 -08:00
nfc	NFC: DEP link hook implementation for pn533	2011-12-14 14:50:13 -05:00
nubus
of	dt/device: Fix auxdata matching to handle entries without a name override	2011-12-12 14:41:45 -07:00
oprofile	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-01-06 08:02:58 -08:00
parisc
parport
pci	Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-01-06 13:58:21 -08:00
pcmcia
pinctrl
platform	toshiba_acpi: Fix machines that don't support HCI_SYSTEM_EVENT	2011-12-05 13:07:28 -05:00
pnp
power	x86/mrst: Battery fixes	2011-12-05 17:06:37 +01:00
pps
ps3
ptp	ptp: Fix clock_getres() implementation	2011-12-06 11:38:32 +01:00
rapidio	rapidio/tsi721: modify PCIe capability settings	2011-12-09 07:50:29 -08:00
regulator	regulator: twl: fix twl4030 support for smps regulators	2011-11-28 18:58:31 +00:00
rtc	Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2012-01-06 18:03:30 -08:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
sbus	sbus: convert drivers/sbus/char/* to use module_platform_driver()	2011-12-04 10:46:58 -08:00
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2012-01-06 18:28:12 -08:00
sfi
sh
sn
spi	Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2012-01-06 18:03:30 -08:00
ssb	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2011-12-14 14:35:41 -05:00
staging	staging: r8712u: Add new USB ID	2011-12-13 16:13:15 -08:00
target	iscsi-target: Fix hex2bin warn_unused compile message	2011-12-06 06:00:59 +00:00
tc
telephony
thermal
tty	Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2012-01-06 18:03:30 -08:00
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
uwb
vhost
video	Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2012-01-06 18:03:30 -08:00
virt
virtio	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-02 13:49:21 -05:00
vlynq
w1
watchdog	Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2012-01-06 18:03:30 -08:00
xen	Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"	2011-12-19 09:30:35 -05:00
zorro
Kconfig
Makefile