Michael Buesch 564d9bdd89 nl80211: Fix comment merge error ... The comments ended up in the wrong place due to a merge error. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>		2008-06-14 12:18:01 -04:00
..
acpi
asm-alpha	asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace	2008-05-14 19:11:14 -07:00
asm-arm	[ARM] fix OMAP include loops	2008-05-23 15:38:07 +01:00
asm-avr32	avr32: types: use <asm-generic/int-*.h> for the avr32 architecture	2008-05-02 16:18:20 -07:00
asm-blackfin	Blackfin arch: update anomaly headers from toolchain trunk	2008-05-31 15:47:17 +08:00
asm-cris	cris: types: use <asm-generic/int-*.h> for the cris architecture	2008-05-02 16:18:20 -07:00
asm-frv	Fix FRV minimum slab/kmalloc alignment	2008-05-28 09:05:28 -07:00
asm-generic	gpio: build fixes	2008-05-24 09:56:13 -07:00
asm-h8300	asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace	2008-05-14 19:11:14 -07:00
asm-ia64	[IA64] Workaround for RSE issue	2008-05-27 13:24:39 -07:00
asm-m32r	m32r: types: use <asm-generic/int-*.h> for the m32r architecture	2008-05-02 16:18:21 -07:00
asm-m68k	m68k: Prefix ISA type with ISA_TYPE_	2008-05-18 13:28:50 -07:00
asm-m68knommu	m68knommu: rework definition of HZ	2008-05-01 08:08:36 -07:00
asm-mips	fix parenthesis in include/asm-mips/mach-au1x00/au1000.h	2008-05-24 09:56:08 -07:00
asm-mn10300	MN10300: Fix typo in header guard	2008-05-28 07:59:06 -07:00
asm-parisc	parisc: use conditional macro for 64-bit wide ops	2008-05-15 11:03:43 -04:00
asm-powerpc	[POWERPC] Add "memory" clobber to MMIO accessors	2008-05-31 17:08:28 +10:00
asm-ppc	[POWERPC] ppc: More compile fixes	2008-05-12 22:57:51 +10:00
asm-s390	[S390] s390 types: make dma_addr_t 64 bit capable	2008-05-30 10:03:33 +02:00
asm-sh	sh: use the common ascii hex helpers	2008-05-16 15:09:08 +09:00
asm-sparc	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
asm-sparc64	sparc64: global_reg_snapshot is not for userspace	2008-05-25 22:50:16 -07:00
asm-um	asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace	2008-05-14 19:11:14 -07:00
asm-v850	asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace	2008-05-14 19:11:14 -07:00
asm-x86	x86: prevent PGE flush from interruption/preemption	2008-05-23 18:16:15 +02:00
asm-xtensa	asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace	2008-05-14 19:11:14 -07:00
crypto
keys
linux	nl80211: Fix comment merge error	2008-06-14 12:18:01 -04:00
math-emu
media	Fix a deadlock in the bttv driver	2008-05-20 10:12:26 -07:00
mtd
net	Merge branch 'net-next-2.6-misc-20080612a' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-next	2008-06-11 22:33:59 -07:00
pcmcia
rdma
rxrpc
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2008-05-02 13:52:35 -07:00
sound	[ALSA] ASoC: build fix for snd_soc_info_bool_ext	2008-05-13 14:47:44 +02:00
video
xen
Kbuild