David S. Miller 0a0e9ae1bd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/bnx2x/bnx2x.h		2011-03-03 21:27:42 -08:00
..
accessibility
acpi	ACPI / ACPICA: Implicit notify for multiple devices	2011-02-24 19:59:21 +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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-03-03 21:27:42 -08:00
bluetooth	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-03-03 21:27:42 -08:00
cdrom	cdrom: support devices that have check_events but not media_changed	2011-02-09 14:22:37 +01:00
char	Revert "TPM: Long default timeout fix"	2011-03-01 13:23:27 -08: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
crypto
dca
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	drivers/gpio/pca953x.c: add a mutex to fix race condition	2011-02-11 16:12:20 -08:00
gpu	drm/i915: fix memory corruption with GM965 and >4GB RAM	2011-03-01 23:18:44 +00:00
hid	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
hwmon	hwmon: (adt7411) add MODULE_DEVICE_TABLE	2011-02-26 08:59:32 -08:00
i2c	i2c-omap: fixup commit cb527ede1b whitespace	2011-02-23 00:43:55 +00: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	ipv4: Make output route lookup return rtable directly.	2011-03-02 14:31:35 -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
macintosh	powerpc/macintosh: Fix wrong test in fan_{read,write}_reg()	2011-01-21 14:08:34 +11:00
mca
md	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-03-03 21:27:42 -08:00
media	Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-02-02 17:52:19 -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	workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'	2011-02-16 17:48:59 +01:00
mmc	ARM: mmci: round down the bytes transferred on error	2011-01-31 10:53:37 +00:00
mtd	workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'	2011-02-16 17:48:59 +01:00
net	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-03-03 21:27:42 -08:00
nfc	drivers/nfc/pn544.c: add missing regulator	2011-02-25 15:07:36 -08:00
nubus
of	of/promtree: allow DT device matching by fixing 'name' brokenness (v5)	2011-03-02 13:45:19 -07:00
oprofile
parisc
parport	parport: make lockdep happy with waitlist_lock	2011-01-26 10:49:59 +10:00
pci	pci: use security_capable() when checking capablities during config space read	2011-02-15 19:06:31 +11:00
pcmcia	pcmcia: re-enable Zoomed Video support	2011-02-20 12:47:34 +01:00
platform	dell-laptop: Toggle the unsupported hardware killswitch	2011-02-21 17:06:21 -05:00
pnp
power
pps	pps: initialize ts_real properly	2011-02-25 15:07:37 -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	drivers/rtc/rtc-ds3232.c: fix time range difference between linux and RTC chip	2011-02-25 15:07:37 -08:00
s390	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-03-03 21:27:42 -08:00
sbus
scsi	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-03-03 21:27:42 -08:00
sfi
sh
sn
spi	spi/pxa2xx pci: fix the release - remove race	2011-02-15 13:25:36 -07:00
ssb	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2011-02-22 15:10:22 -05:00
staging	netlink: kill eff_cap from struct netlink_skb_parms	2011-03-03 13:32:07 -08:00
target	[SCSI] target: fix use after free detected by SLUB poison	2011-02-12 12:32:41 -06:00
tc
telephony
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	netlink: kill eff_cap from struct netlink_skb_parms	2011-03-03 13:32:07 -08:00
virtio
vlynq
w1	drivers/w1/masters/omap_hdq.c: add missing clk_put	2011-02-11 16:12:20 -08:00
watchdog	m68knommu: Rename m548x_wdt.c to m54xx_wdt.c	2011-02-08 15:07:45 +10:00
xen	xen: suspend and resume system devices when running PVHVM	2011-02-17 10:31:20 +00:00
zorro
Kconfig
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