Linus Torvalds c63a119036 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 ... * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (23 commits) iwlwifi: fix rf_kill state inconsistent during suspend and resume b43: Fix rfkill radio LED bcm43xx_debugfs sscanf fix libertas: select WIRELESS_EXT iwlwifi3945/4965: fix rate control algo reference leak ieee80211_rate: missed unlock wireless/ipw2200.c: add __dev{init,exit} annotations zd1211rw: Fix alignment problems libertas: add Dan Williams as maintainer sis190 endianness ucc_geth: really fix section mismatch pcnet_cs: add new id ixgb: make sure jumbos stay enabled after reset Net: ibm_newemac, remove SPIN_LOCK_UNLOCKED net: smc911x: shut up compiler warnings ucc_geth: minor whitespace fix drivers/net/s2io.c section fixes drivers/net/sis190.c section fix hamachi endianness fixes e100: free IRQ to remove warningwhenrebooting ...		2007-12-17 19:29:41 -08:00
..
acorn/char
acpi	Pull bugzilla-9362 into release branch	2007-12-14 15:14:52 -05:00
amba
ata	libata: fix ATAPI draining	2007-12-17 20:43:28 -05:00
atm	[ATM]: Fix compiler warning noise with FORE200E driver	2007-12-14 13:54:39 -08:00
auxdisplay
base
block	pktcdvd: add kobject_put when kobject register fails	2007-12-17 19:28:16 -08:00
bluetooth
cdrom
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6	2007-12-17 13:33:47 -08:00
clocksource
connector
cpufreq	drivers/cpufreq/cpufreq_stats.c section fix	2007-12-17 19:28:16 -08:00
cpuidle
crypto	uml: add !UML dependencies	2007-12-03 08:13:17 -08:00
dca
dio
dma	I/OAT: fix null device in call to dev_err()	2007-12-17 19:28:17 -08:00
edac
eisa
firewire	firewire: OHCI 1.0 Isochronous Receive support	2007-12-10 21:55:19 +01:00
firmware
hid
hwmon	HWMON: coretemp, suspend fix	2007-12-04 01:35:32 -05:00
i2c	i2c/isp1301_omap: Build fix	2007-12-12 13:45:25 +01:00
ide	ide: fix ->io_32bit race in set_io_32bit()	2007-12-12 23:32:00 +01:00
ieee1394
infiniband	IB/ehca: Fix lock flag variable location, bump version number	2007-12-13 09:37:23 -08:00
input	spi: use simplified spi_sync() calling convention	2007-12-05 09:21:19 -08:00
isdn	I4L: fix isdn_ioctl memory overrun vulnerability	2007-12-03 08:13:17 -08:00
kvm
leds	leds: Fix led trigger locking bugs	2007-12-07 09:06:53 +00:00
lguest
macintosh	drivers/macintosh/via-pmu.c: Added a missing iounmap	2007-12-17 19:28:16 -08:00
mca
md
media	V4L/DVB (6820): s5h1409: QAM SNR related fixes	2007-12-13 17:58:06 -02:00
message
mfd
misc	ACPI: thinkpad-acpi: fix lenovo keymap for brightness	2007-12-13 21:59:59 -05:00
mmc	spi: use simplified spi_sync() calling convention	2007-12-05 09:21:19 -08:00
mtd
net	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6	2007-12-17 19:29:41 -08:00
nubus
of
oprofile
parisc	[PARISC] lba_pci: pci_claim_resources disabled expansion roms	2007-12-06 09:38:26 -08:00
parport	parport: "dev->timeslice" is an unsigned long, not an int	2007-12-17 19:28:15 -08:00
pci	PCI: Restore PCI expansion ROM P2P prefetch window creation	2007-12-17 10:41:19 -08:00
pcmcia	pcmcia: fix kernel-doc comments	2007-12-10 19:43:54 -08:00
pnp
power
ps3
rapidio
rtc	rtc-at32ap700x: fix irq init oops	2007-12-17 19:28:15 -08:00
s390	[S390]: Fix use of skb after netif_rx	2007-12-11 02:45:29 -08:00
sbus
scsi	ide-scsi: add ide_scsi_hex_dump() helper	2007-12-12 23:31:57 +01:00
serial	[SERIAL] sparc: Infrastructure to fix section mismatch bugs.	2007-12-12 07:36:34 -08:00
sh
sn
spi	atmel_spi: reload RCR before TCR	2007-12-10 19:43:55 -08:00
ssb
tc
telephony
uio
usb	USB: revert portions of "UNUSUAL_DEV: Sync up some reported devices from Ubuntu"	2007-12-17 10:47:16 -08:00
video
virtio
w1
watchdog	[WATCHDOG] add Nano 7240 driver	2007-12-04 16:48:06 +00:00
xen
zorro
Kconfig
Makefile