Linus Torvalds a319a2773a Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 ... * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (217 commits) net/ieee80211: fix more crypto-related build breakage [PATCH] Spidernet: add ethtool -S (show statistics) [NET] GT96100: Delete bitrotting ethernet driver [PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM [PATCH] Cirrus Logic ep93xx ethernet driver r8169: the MMIO region of the 8167 stands behin BAR#1 e1000, ixgb: Remove pointless wrappers [PATCH] Remove powerpc specific parts of 3c509 driver [PATCH] s2io: Switch to pci_get_device [PATCH] gt96100: move to pci_get_device API [PATCH] ehea: bugfix for register access functions [PATCH] e1000 disable device on PCI error drivers/net/phy/fixed: #if 0 some incomplete code drivers/net: const-ify ethtool_ops declarations [PATCH] ethtool: allow const ethtool_ops [PATCH] sky2: big endian [PATCH] sky2: fiber support [PATCH] sky2: tx pause bug fix drivers/net: Trim trailing whitespace [PATCH] ehea: IBM eHEA Ethernet Device Driver ... Manually resolved conflicts in drivers/net/ixgb/ixgb_main.c and drivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by commit 84fa7933a3 that just happened to be next to unrelated changes in this update.		2006-09-24 10:15:13 -07:00
..
acorn	[PATCH] irq-flags: misc drivers: Use the new IRQF_ constants	2006-07-02 13:58:50 -07:00
acpi	Merge trivial low-risk suspend hotkey bugzilla-5918 into release	2006-08-20 21:49:29 -04:00
amba
atm	[NET]: Replace CHECKSUM_HW by CHECKSUM_PARTIAL/CHECKSUM_COMPLETE	2006-09-22 14:53:53 -07:00
base	[S390] hypfs comment cleanup.	2006-09-20 15:58:44 +02:00
block	Merge mulgrave-w:git/scsi-misc-2.6	2006-09-23 15:33:43 -05:00
bluetooth	[Bluetooth] Enable SCO support for Broadcom HID proxy dongle	2006-07-24 12:44:34 -07:00
cdrom	[PATCH] cdrom/gdsc: fix printk format warning	2006-08-27 11:01:33 -07:00
char	[PATCH] briq_panel: read() and write() get __user pointers, damnit	2006-09-23 11:34:43 -07:00
clocksource
connector	[PATCH] Process Events: Fix biarch compatibility issue. use __u64 timestamp	2006-07-31 13:28:36 -07:00
cpufreq	[CPUFREQ] Fix some more CPU hotplug locking.	2006-09-22 19:15:23 -04:00
crypto	[CRYPTO] padlock: Convert padlock-sha to use crypto_hash	2006-09-21 11:46:22 +10:00
dio
dma	[I/OAT]: Remove pci_module_init() from Intel I/OAT DMA engine	2006-07-21 14:50:13 -07:00
edac	[PATCH] drivers/edac/edac_mc.h must #include <linux/platform_device.h>	2006-08-06 08:57:46 -07:00
eisa
fc4	[SCSI] More buffer->request_buffer changes	2006-07-14 09:41:13 -05:00
firmware
hwmon	[PATCH] hwmon: abituguru timeout fixes	2006-08-26 13:05:19 -07:00
i2c	Merge branch 'merge'	2006-08-31 15:45:48 +10:00
ide	[POWERPC] Fix ohare IDE irq workaround on old powermacs	2006-09-22 15:19:58 +10:00
ieee1394	[PATCH] 1394: fix for recently added firewire patch that breaks things on ppc	2006-08-27 11:01:28 -07:00
infiniband	Merge mulgrave-w:git/linux-2.6	2006-09-23 21:03:52 -05:00
input	Input: psmouse - fix Intellimouse 4.0 initialization	2006-08-23 00:48:03 -04:00
isdn	Merge branch 'master' into upstream	2006-08-07 06:38:41 -04:00
leds	[PATCH] net48xx LED cleanups	2006-07-14 21:53:54 -07:00
macintosh	[PATCH] asm/backlight.h is ppc-only	2006-09-22 17:48:57 -07:00
mca
md	[BLOCK] dm-crypt: trivial comment improvements	2006-09-21 11:46:27 +10:00
media	V4L/DVB (4608c): Fix I2C dependencies for saa7146 modules	2006-09-10 13:46:01 -03:00
message	[SCSI] scsi_transport_sas: remove local_attached flag	2006-08-27 22:30:11 -05:00
mfd	[ARM] 3727/1: fix ucb initialization on collie	2006-07-11 22:54:15 +01:00
misc	[PATCH] irq-flags: misc drivers: Use the new IRQF_ constants	2006-07-02 13:58:50 -07:00
mmc	[MMC] Always use a sector size of 512 bytes	2006-09-07 16:01:30 +01:00
mtd	[MTD] Whitespace cleanup in SSFDC driver.	2006-09-23 16:20:48 +01:00
net	Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6	2006-09-24 10:15:13 -07:00
nubus
oprofile
parisc	[PATCH] irq-flags: PARISC: Use the new IRQF_ constants	2006-07-02 13:58:52 -07:00
parport	[PATCH] irq-flags: misc drivers: Use the new IRQF_ constants	2006-07-02 13:58:50 -07:00
pci	Merge branch 'linux-2.6'	2006-09-14 07:07:18 +10:00
pcmcia	[PATCH] pcmcia: fix ioctl GET_CONFIGURATION_INFO for pcmcia_cards	2006-07-31 13:28:41 -07:00
pnp	[PATCH] pnpacpi: reject ACPI_PRODUCER resources	2006-08-06 08:57:49 -07:00
rapidio
rtc	[PATCH] rtc-s3c.c: fix time setting checks	2006-08-27 11:01:28 -07:00
s390	[SCSI] zfcp: fix: avoid removal of fsf reqs before qdio queues are down	2006-09-23 18:01:46 -05:00
sbus	[OPENPROMIO]: Handle current_node being NULL correctly.	2006-09-18 01:47:13 -07:00
scsi	[SCSI] scsi_transport_fc: fixup netlink arguments	2006-09-23 22:07:20 -05:00
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2006-09-22 12:48:03 -07:00
sh
sn	[PATCH] irq-flags: misc drivers: Use the new IRQF_ constants	2006-07-02 13:58:50 -07:00
spi	[PATCH] lockdep: annotate on-stack completions	2006-07-03 15:27:09 -07:00
tc	[PATCH] irq-flags: misc drivers: Use the new IRQF_ constants	2006-07-02 13:58:50 -07:00
telephony
usb	[PATCH] fallout from hcd-core patch	2006-09-22 17:48:57 -07:00
video	[PATCH] more get_property() fallout	2006-09-23 11:34:43 -07:00
w1	[PATCH] w1: remove drivers/w1/w1.h	2006-07-12 15:38:28 -07:00
zorro
Kconfig
Makefile