Linus Torvalds d10902812c Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (27 commits) x86: Clean up apic.c and apic.h x86: Remove superflous goal definition of tsc_sync x86: dt: Correct local apic documentation in device tree bindings x86: dt: Cleanup local apic setup x86: dt: Fix OLPC=y/INTEL_CE=n build rtc: cmos: Add OF bindings x86: ce4100: Use OF to setup devices x86: ioapic: Add OF bindings for IO_APIC x86: dtb: Add generic bus probe x86: dtb: Add support for PCI devices backed by dtb nodes x86: dtb: Add device tree support for HPET x86: dtb: Add early parsing of IO_APIC x86: dtb: Add irq domain abstraction x86: dtb: Add a device tree for CE4100 x86: Add device tree support x86: e820: Remove conditional early mapping in parse_e820_ext x86: OLPC: Make OLPC=n build again x86: OLPC: Remove extra OLPC_OPENFIRMWARE_DT indirection x86: OLPC: Cleanup config maze completely x86: OLPC: Hide OLPC_OPENFIRMWARE config switch ... Fix up conflicts in arch/x86/platform/ce4100/ce4100.c		2011-03-15 20:01:36 -07:00
..
accessibility
acpi	Merge commit 'v2.6.38' into x86/mm	2011-03-15 08:29:44 +01:00
amba
ata	libata: set queue DMA alignment to sector size for ATAPI too	2011-01-28 03:16:20 -05:00
atm	ATM, Solos PCI ADSL2+: Don't deref NULL pointer if net_ratelimit() and alloc_skb() interact badly.	2011-02-13 16:55:46 -08:00
auxdisplay
base	PM / Runtime: Don't enable interrupts while running in_interrupt	2011-01-25 20:50:07 +01:00
block	Merge branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm	2011-03-15 10:59:09 -07:00
bluetooth	Revert "Bluetooth: Enable USB autosuspend by default on btusb"	2011-02-23 19:42:03 -08:00
cdrom	cdrom: support devices that have check_events but not media_changed	2011-02-09 14:22:37 +01:00
char	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-15 18:53:35 -07:00
clk
clocksource	drivers/clocksource/tcb_clksrc.c: fix init sequence	2011-01-26 10:50:04 +10:00
connector
cpufreq	[CPUFREQ] fix BUG on cpufreq policy init failure	2011-03-01 18:49:44 -05:00
cpuidle	Merge branch 'cpuidle-perf-events' into idle-test	2011-01-12 18:06:19 -05:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2011-01-13 10:25:58 -08:00
dca	dca: remove unneeded NULL check	2011-01-13 08:03:09 -08:00
dio
dma	Merge branch 'imx' into dmaengine-fixes	2011-02-14 02:40:46 -08:00
edac	amd64_edac: Fix DIMMs per DCTs output	2011-02-10 14:41:49 +01:00
eisa
firewire	Merge branches 'fixes' and 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2011-01-21 13:34:39 -08:00
firmware	x86, dmi, debug: Log board name (when present) in dmesg/oops output	2011-02-15 04:20:57 +01:00
gpio	gpio: add MODULE_DEVICE_TABLE	2011-03-13 15:35:59 -07:00
gpu	drm/radeon: fix problem with changing active VRAM size. (v2)	2011-03-14 12:51:04 +10:00
hid	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
hwmon	hwmon/f71882fg: Set platform drvdata to NULL later	2011-03-13 07:42:52 -07:00
i2c	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-15 20:01:36 -07:00
ide	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
idle	intel_idle: disable Atom/Lincroft HW C-state auto-demotion	2011-02-17 17:08:48 -05:00
ieee802154
infiniband	Merge branches 'nes' and 'qib' into for-next	2011-02-17 14:04:59 -08:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-02-23 14:44:25 -08:00
isdn	drivers:isdn:istream.c Fix typo pice to piece	2011-02-28 12:07:32 -08:00
leds	leds: leds-pwm: return proper error if pwm_request failed	2011-01-26 10:49:58 +10:00
lguest	lguest: compile fixes	2011-01-20 21:37:29 +10:30
macintosh	powerpc/macintosh: Fix wrong test in fan_{read,write}_reg()	2011-01-21 14:08:34 +11:00
mca
md	md: Fix - again - partition detection when array becomes active	2011-02-24 17:26:41 +11:00
media	Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-03-10 13:22:10 -08:00
memstick	workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'	2011-02-16 17:48:59 +01:00
message	[SCSI] mptfusion: Bump version 03.04.18	2011-02-12 12:51:21 -06:00
mfd	mfd: Avoid tps6586x burst writes	2011-03-02 10:57:50 +01:00
misc	drivers/misc/bmp085.c: add MODULE_DEVICE_TABLE	2011-03-04 17:53:38 -08:00
mmc	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-15 20:01:36 -07:00
mtd	Merge git://git.infradead.org/users/dwmw2/mtd-2.6.38	2011-03-13 15:56:22 -07:00
net	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-15 20:01:36 -07:00
nfc	drivers/nfc/pn544.c: add missing regulator	2011-02-25 15:07:36 -08:00
nubus
of	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-15 20:01:36 -07:00
oprofile
parisc
parport	parport: make lockdep happy with waitlist_lock	2011-01-26 10:49:59 +10:00
pci	pci/xen: Cleanup: convert int** to int[]	2011-02-18 12:41:49 -05:00
pcmcia	Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-07 20:45:42 -08:00
platform	dell-laptop: Toggle the unsupported hardware killswitch	2011-02-21 17:06:21 -05:00
pnp	Merge branch 'pnp' into release	2011-01-12 04:59:44 -05:00
power	Merge git://git.infradead.org/battery-2.6	2011-01-14 09:25:59 -08:00
pps	pps: make pps_gen_parport depend on BROKEN	2011-03-04 17:53:38 -08:00
ps3
rapidio	rapidio: fix sysfs config attribute to access 16MB of maint space	2011-02-25 15:07:37 -08:00
regulator	regulator, mc13xxx: Remove pointless test for unsigned less than zero	2011-02-25 08:51:07 +00:00
rtc	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-15 20:01:36 -07:00
s390	[S390] tape: deadlock on system work queue	2011-03-03 17:56:14 +01:00
sbus
scsi	block: add @force_kblockd to __blk_run_queue()	2011-03-02 08:48:05 -05:00
sfi	SFI: use ioremap_cache() instead of ioremap()	2011-01-11 23:27:25 -05:00
sh	sh: update INTC to clear IRQ sense valid flag	2011-01-19 19:02:35 +09:00
sn
spi	Merge branch 'linus' into x86/platform	2011-02-23 09:21:41 +01:00
ssb	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2011-02-08 12:03:54 -08:00
staging	Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-02-10 12:19:23 -08:00
target	[SCSI] target: Fix t_transport_aborted handling in LUN_RESET + active I/O shutdown	2011-02-28 11:23:32 -06:00
tc
telephony	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
thermal	ACPI: Fix build for CONFIG_NET unset	2011-02-28 18:00:31 -08:00
tty	fmvj18x_cs: add new id	2011-02-28 12:06:20 -08:00
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-03-03 15:43:15 -08:00
uwb
vhost	vhost: rcu annotation fixup	2011-02-01 16:48:46 +02:00
video	drivers/video/backlight/ltv350qv.c: fix a memory leak	2011-03-04 17:53:38 -08:00
virtio	virtio: remove virtio-pci root device	2011-01-20 21:37:30 +10:30
vlynq
w1	drivers/w1/masters/omap_hdq.c: add missing clk_put	2011-02-11 16:12:20 -08:00
watchdog	watchdog: hpwdt: eliminate section mismatch warning	2011-03-14 10:44:31 +00:00
xen	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-15 19:23:40 -07:00
zorro
Kconfig	[SCSI] target: Add LIO target core v4.0.0-rc6	2011-01-14 10:12:29 -06:00
Makefile	Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-20 16:39:23 -08:00