Arend van Spriel a0f24c8a93 brcm80211: smac: remove duplicate definition of D11_PHY_HDR_LEN ... The macro definition D11_PHY_HDR_LEN was defined in d11.h and pub.h. It has been removed from pub.h. Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Alwin Beukers <alwin@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>		2011-11-11 14:28:31 -05:00
..
accessibility
acpi	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:08:43 +02:00
amba
ata
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2011-10-25 13:25:22 +02:00
auxdisplay
base	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2011-10-25 15:18:39 +02:00
bcma
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-10-25 12:11:02 +02:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next	2011-11-09 14:54:33 -05:00
cdrom
char	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:03:38 +02:00
clk
clocksource	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
connector	connector: add comm change event report to proc connector	2011-09-28 13:41:50 -04:00
cpufreq	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
cpuidle
crypto
dca
devfreq	PM / devfreq: Add basic governors	2011-10-02 00:19:34 +02:00
dio
dma
edac
eisa
firewire
firmware
gpio	gpio-pca953x: fix gpio_base	2011-10-13 13:49:37 -06:00
gpu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-10-25 12:11:02 +02:00
hid	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2011-10-25 15:18:39 +02:00
hv	hv: remove struct hv_device_info from hyperv.h	2011-10-11 09:51:22 -06:00
hwmon	hwmon: (w83627ehf) Better fix for negative temperature values	2011-10-24 11:09:48 -07:00
hwspinlock
i2c
ide	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-10-25 12:11:02 +02:00
idle
ieee802154
infiniband	net: add skb frag size accessors	2011-10-19 03:10:46 -04:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-10-25 12:11:02 +02:00
iommu	Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 16:17:32 +02:00
isdn	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty	2011-10-26 15:11:09 +02:00
leds
lguest
macintosh
mca
md	Merge branch 'for-linus' of git://neil.brown.name/md	2011-10-26 21:39:42 +02:00
media	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2011-10-25 15:18:39 +02:00
memstick
message
mfd	Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regmap	2011-10-25 13:57:45 +02:00
misc	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2011-10-25 12:13:59 +02:00
mmc
mtd
net	brcm80211: smac: remove duplicate definition of D11_PHY_HDR_LEN	2011-11-11 14:28:31 -05:00
nfc
nubus
of
oprofile
parisc
parport	parport_pc: release IO region properly if unsupported ITE887x card is found	2011-10-18 14:17:40 -07:00
pci	Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 16:11:53 +02:00
pcmcia	ARM: 7024/1: simpad: Cleanup CS3 accessors.	2011-10-17 09:12:42 +01:00
pinctrl	pinctrl/sirf: fix sirfsoc_get_group_pins prototype	2011-10-25 10:43:57 +02:00
platform	thinkpad_acpi: Fix printk typo 'bluestooth'	2011-10-07 09:39:51 +02:00
pnp
power
pps
ps3
ptp
rapidio
regulator
rtc
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2011-10-25 13:25:22 +02:00
sbus
scsi	Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd	2011-10-26 21:33:50 +02:00
sfi
sh
sn
spi	spi-topcliff-pch: Fix overrun issue	2011-10-04 10:10:50 -06:00
ssb
staging	Remove stale "depends on NETDEV_1000"in staging drivers	2011-10-26 17:21:19 +02:00
target	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-10-25 12:11:02 +02:00
tc
telephony
thermal
tty	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty	2011-10-26 15:11:09 +02:00
uio	uio: Support physical addresses >32 bits on 32-bit systems	2011-10-18 11:18:57 -07:00
usb	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2011-10-25 15:18:39 +02:00
uwb
vhost
video	Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 16:17:32 +02:00
virt
virtio	Add ethtool -g support to virtio_net	2011-10-24 02:07:21 -04:00
vlynq
w1
watchdog	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:03:38 +02:00
xen	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 16:44:09 +02:00
zorro	zorro: Fix four checkpatch warnings	2011-10-24 21:00:34 +02:00
Kconfig	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging	2011-10-26 15:39:02 +02:00
Makefile	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging	2011-10-26 15:39:02 +02:00