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	create /sys/.../power when CONFIG_PM is set	2007-11-28 13:53:53 -08:00
block	pktcdvd: add kobject_put when kobject register fails	2007-12-17 19:28:16 -08:00
bluetooth	[Bluetooth] Add generic driver for Bluetooth USB devices	2007-10-22 02:59:46 -07:00
cdrom	SG: audit of drivers that use blk_rq_map_sg()	2007-10-24 13:21:21 +02:00
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	[CONNECTOR]: Fix a spurious kfree_skb() call	2007-10-30 21:29:47 -07:00
cpufreq	drivers/cpufreq/cpufreq_stats.c section fix	2007-12-17 19:28:16 -08:00
cpuidle	cpuidle: remove unused exports	2007-10-29 17:27:50 -04:00
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	i5000_edac: no need to __stringify() KBUILD_BASENAME	2007-11-14 18:45:41 -08:00
eisa
firewire	firewire: OHCI 1.0 Isochronous Receive support	2007-12-10 21:55:19 +01:00
firmware	define global BIT macro	2007-10-19 11:53:42 -07:00
hid	HID: Don't access input_dev->private directly	2007-10-31 13:30:35 +01:00
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	ieee1394: iso and async streams: s/g list fix	2007-11-04 14:31:16 +01:00
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	KVM: SVM: Fix FPU leak while emulating clts	2007-11-27 15:38:18 +02:00
leds	leds: Fix led trigger locking bugs	2007-12-07 09:06:53 +00:00
lguest	virtio: fix module/device unloading	2007-11-19 11:20:42 +11:00
macintosh	drivers/macintosh/via-pmu.c: Added a missing iounmap	2007-12-17 19:28:16 -08:00
mca
md	raid5: fix unending write sequence	2007-11-14 18:45:39 -08:00
media	V4L/DVB (6820): s5h1409: QAM SNR related fixes	2007-12-13 17:58:06 -02:00
message	i2o: debug messages corrected	2007-11-05 15:12:31 -08:00
mfd	MFD: SM501 debug typo fix	2007-11-29 09:24:53 -08:00
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	Eliminate pointless casts from void* in a few driver irq handlers.	2007-10-23 19:53:16 -04:00
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	[SPARC/64]: Consolidate of_register_driver	2007-10-17 21:17:42 -07:00
oprofile	oProfile: oops when profile_pc() returns ~0LU	2007-11-14 18:45:37 -08:00
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	drivers/pnp/resource.c: Add missing pci_dev_put	2007-11-29 09:24:52 -08:00
power	Merge git://git.infradead.org/battery-2.6	2007-10-22 19:20:52 -07:00
ps3	ps3: prefix all ps3-specific kernel modules with `ps3-'	2007-11-29 09:24:51 -08:00
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	[WATCHDOG] Sbus: cpwatchdog, remove SPIN_LOCK_UNLOCKED	2007-11-19 21:09:52 +00:00
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	superhyway: Handle device_register() retval properly.	2007-11-07 11:13:55 +09:00
sn
spi	atmel_spi: reload RCR before TCR	2007-12-10 19:43:55 -08:00
ssb	ssb: Fix PCMCIA-host lowlevel bus access	2007-11-10 22:01:53 -08:00
tc
telephony	telephony: phonedev panics if unregistering device not registered [Bug 9266]	2007-11-05 15:12:33 -08:00
uio
usb	USB: revert portions of "UNUSUAL_DEV: Sync up some reported devices from Ubuntu"	2007-12-17 10:47:16 -08:00
video	x86_64 EFI boot support: EFI frame buffer driver	2007-11-29 09:24:54 -08:00
virtio	virtio: fix module/device unloading	2007-11-19 11:20:42 +11:00
w1	W1: fix memset size error	2007-11-14 18:45:36 -08:00
watchdog	[WATCHDOG] add Nano 7240 driver	2007-12-04 16:48:06 +00:00
xen	Add missing newlines to some uses of dev_<level> messages	2007-10-18 14:37:28 -07:00
zorro	Amiga zorro bus: Add missing zorro_device_remove()	2007-11-26 19:15:31 -08:00
Kconfig	Virtio interface	2007-10-23 15:49:54 +10:00
Makefile	Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2007-10-23 16:37:29 -07:00