David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/infiniband/core/iwcm.c drivers/net/chelsio/cxgb2.c drivers/net/wireless/bcm43xx/bcm43xx_main.c drivers/net/wireless/prism54/islpci_eth.c drivers/usb/core/hub.h drivers/usb/input/hid-core.c net/core/netpoll.c Fix up merge failures with Linus's head and fix new compilation failures. Signed-Off-By: David Howells <dhowells@redhat.com>		2006-12-05 14:37:56 +00:00
..
bcm43xx_debugfs.c	[PATCH] inode_diet: Replace inode.u.generic_ip with inode.i_private	2006-09-27 08:26:17 -07:00
bcm43xx_debugfs.h	[PATCH] bcm43xx: init routine rewrite	2006-07-27 18:19:18 -04:00
bcm43xx_dma.c	[PATCH] bcm43xx-softmac: Fix system hang for x86-64 with >1GB RAM	2006-10-16 20:09:48 -04:00
bcm43xx_dma.h	[PATCH] missing include of dma-mapping.h	2006-10-24 22:01:11 -07:00
bcm43xx_ethtool.c	drivers/net: const-ify ethtool_ops declarations	2006-09-13 14:30:00 -04:00
bcm43xx_ethtool.h	drivers/net: const-ify ethtool_ops declarations	2006-09-13 14:30:00 -04:00
bcm43xx_ilt.c	[PATCH] bcm43xx: reduce the size of bcm43xx_private by removing unneeded members.	2006-03-27 11:19:37 -05:00
bcm43xx_ilt.h	[PATCH] bcm43xx: fix some stuff, add a few missing mmiowb(), remove dead code.	2006-03-27 11:19:36 -05:00
bcm43xx_leds.c	[PATCH] bcm43xx: fix unexpected LED control values in BCM4303 sprom	2006-10-31 22:15:41 -05:00
bcm43xx_leds.h	[PATCH] bcm43xx: fix unexpected LED control values in BCM4303 sprom	2006-10-31 22:15:41 -05:00
bcm43xx_main.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 14:37:56 +00:00
bcm43xx_main.h	[PATCH] bcm43xx-softmac: Init, shutdown and restart fixes	2006-09-11 19:34:00 -04:00
bcm43xx_phy.c	[PATCH] bcm43xx-softmac: update PHY initialization	2006-09-25 16:52:16 -04:00
bcm43xx_phy.h	[PATCH] wireless: import bcm43xx sources	2006-03-27 11:18:23 -05:00
bcm43xx_pio.c	[PATCH] bcm43xx: opencoded locking	2006-07-10 14:19:41 -04:00
bcm43xx_pio.h	[PATCH] bcm43xx: preemptible periodic work	2006-06-15 15:48:13 -04:00
bcm43xx_power.c	[PATCH] bcm43xx: add PCI-E code	2006-12-02 00:11:58 -05:00
bcm43xx_power.h	[PATCH] bcm43xx: fix pctl slowclock limit calculation	2006-04-19 17:25:40 -04:00
bcm43xx_radio.c	[PATCH] Convert bcm43xx-softmac to use the ieee80211_is_valid_channel routine	2006-07-05 13:42:57 -04:00
bcm43xx_radio.h	[PATCH] bcm43xx: set default attenuation values.	2006-03-27 11:19:42 -05:00
bcm43xx_sysfs.c	[PATCH] bcm43xx: remove dead code in bcm43xx_sysfs.c	2006-09-11 19:34:03 -04:00
bcm43xx_sysfs.h	[PATCH] bcm43xx: sysfs code cleanup	2006-04-19 17:25:41 -04:00
bcm43xx_wx.c	[PATCH] ieee80211: Move IV/ICV stripping into ieee80211_rx	2006-12-02 00:11:56 -05:00
bcm43xx_wx.h	[PATCH] wireless: import bcm43xx sources	2006-03-27 11:18:23 -05:00
bcm43xx_xmit.c	[PATCH] bcm43xx: correct "Move IV/ICV stripping into ieee80211_rx"	2006-12-02 00:12:04 -05:00
bcm43xx_xmit.h	[PATCH] bcm43xx: Move TX/RX related functions to its own file. Add basic RTS/CTS code.	2006-03-27 11:18:40 -05:00
bcm43xx.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 14:37:56 +00:00
Kconfig	[PATCH] Add bcm43xx HW RNG support	2006-06-26 09:58:19 -07:00
Makefile	[PATCH] bcm43xx: Add sysfs attributes for device specific tunables.	2006-03-27 11:18:40 -05:00