David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/bluetooth/l2cap_core.c Just two overlapping changes, one added an initialization of a local variable, and another change added a new local variable. Signed-off-by: David S. Miller <davem@davemloft.net>		2011-12-23 17:13:56 -05:00
..
accessibility
acpi	pstore: pass allocated memory region back to caller	2011-11-17 12:58:07 -08:00
amba
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	PM / Driver core: leave runtime PM enabled during system shutdown	2011-12-07 22:26:56 +01: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.dk/linux-block	2011-12-16 10:05:14 -08:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2011-12-09 14:07:12 -05:00
cdrom
char	ipmi_watchdog: restore settings when BMC reset	2011-12-20 10:25:04 -08:00
clk
clocksource
connector
cpufreq	[CPUFREQ] db8500: fix build error due to undeclared i variable	2011-11-11 22:28:33 -05:00
cpuidle
crypto	Merge git://github.com/herbertx/crypto	2011-11-25 21:55:07 -08:00
dca
devfreq	PM / devfreq: correct Kconfig dependency	2011-11-14 23:31:35 +01:00
dio
dma
edac	drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac	2011-11-24 01:59:38 -06:00
eisa
firewire
firmware	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft	2011-12-15 14:16:47 -08:00
gpio	gpio: Fix DA9052 GPIO build errors.	2011-12-15 11:25:43 -07:00
gpu	vmwgfx: Clip cliprects against screen boundaries in present and dirty	2011-12-19 14:06:05 +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	hwmon: (jz4740) Staticise jz4740_hwmon_driver	2011-12-12 08:31: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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-12-19 15:11:12 -08:00
iommu	Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~keithp/linux	2011-12-16 11:27:56 -08:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-02 13:49:21 -05:00
leds	Revert "leds: save the delay values after a successful call to blink_set()"	2011-11-15 22:41:50 -02:00
lguest	enable virtio_net to return bus_info in ethtool -i consistent with emulated NICs	2011-11-16 17:26:46 -05:00
macintosh
mca
md	md: raid5 crash during degradation	2011-12-09 14:26:11 +11:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2011-12-20 10:49:39 -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	mmc: vub300: fix type of firmware_rom_wait_states module parameter	2011-12-19 15:56:09 -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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
nfc	NFC: DEP link hook implementation for pn533	2011-12-14 14:50:13 -05:00
nubus
of	of/irq: Get rid of NO_IRQ usage	2011-12-07 09:06:37 -08:00
oprofile	oprofile: Fix uninitialized memory access when writing to writing to oprofilefs	2011-12-19 17:18:43 +01:00
parisc
parport
pci	pci: Fix hotplug of Express Module with pci bridges	2011-12-18 14:10:16 -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 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-12-20 11:42:38 -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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
sfi
sh
sn
spi	spi/gpio: fix section mismatch warning	2011-12-07 22:17:39 +01: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 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty	2011-11-21 20:36:46 -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	viafb: correct sync polarity for OLPC DCON	2011-11-22 00:56:17 +00: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	watchdog: fix initialisation printout in s3c2410_wdt	2011-11-16 22:04:17 +01: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