David S. Miller 9cbc1cb8cd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/scsi/fcoe/fcoe.c net/core/drop_monitor.c net/core/net-traces.c		2009-06-15 03:02:23 -07:00
..
agnx	Staging: agnx: switch config_interface to bss_info_changed	2009-05-20 14:46:30 -04:00
altpciechdma	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
android	Staging: binder: Defer flush and release operations to avoid deadlocks.	2009-04-17 11:06:27 -07:00
asus_oled	Staging: asus_oled: do not use assignment in if condition	2009-04-03 14:53:15 -07:00
at76_usb	net: fix network drivers ndo_start_xmit() return values (part 8)	2009-06-13 01:18:45 -07:00
b3dfg	Replace all DMA_nBIT_MASK macro with DMA_BIT_MASK(n)	2009-04-13 15:04:33 -07:00
comedi	Staging: comedi: David doesn't want to get comedi patches	2009-05-08 19:39:28 -07:00
dst	Staging: DST: fix build dependancy	2009-04-03 14:53:33 -07:00
echo	Staging: echo cleanup	2009-04-03 14:54:27 -07:00
epl	Staging: epl: convert to netdev_ops	2009-04-17 11:06:24 -07:00
et131x	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
frontier	Staging: frontier: Remove unused components of the alphatrack/tranzport sysfs interface.	2009-04-03 14:53:32 -07:00
go7007	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
heci	Staging: heci: add TODO file	2009-04-03 14:54:24 -07:00
line6	Staging: line6: convert to snd_card_create()	2009-04-17 11:06:25 -07:00
me4000	Staging: me4000: make file_operations const	2009-04-03 14:53:25 -07:00
meilhaus	Staging: meilhaus: some checkpatch.pl cleanup	2009-04-03 14:53:28 -07:00
mimio	Staging: mimio: depends on INPUT	2009-04-03 14:53:29 -07:00
otus	otus/zdusb.c: additional USB idnetifier	2009-04-17 11:06:31 -07:00
p9auth	Staging: p9auth: clean up #includes	2009-04-03 14:54:24 -07:00
panel	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
phison	Staging: phison: depends on PCI	2009-04-03 14:53:40 -07:00
poch	Staging: poch: fix verification of memory area	2009-01-28 15:49:06 -08:00
pohmelfs	Staging: Pohmelfs: Add load balancing between network states with the same priority.	2009-04-17 11:06:31 -07:00
rspiusb	Staging: rspiusb: use USB API functions rather than constants	2009-04-03 14:53:28 -07:00
rt2860	trivial: typo (en|dis|avail|remove)bale -> (en|dis|avail|remove)able	2009-06-12 18:01:45 +02:00
rt2870	trivial: typo (en|dis|avail|remove)bale -> (en|dis|avail|remove)able	2009-06-12 18:01:45 +02:00
rt3070	trivial: typo (en|dis|avail|remove)bale -> (en|dis|avail|remove)able	2009-06-12 18:01:45 +02:00
rtl8187se	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
serqt_usb	serqt: initial clean up pass for tty side	2009-04-07 08:44:05 -07:00
slicoss	staging: slicoss: update README	2009-04-17 11:06:31 -07:00
stlc45xx	Staging: STLC45XX should depend on GENERIC_HARDIRQS	2009-04-17 11:06:27 -07:00
sxg	Staging: sxg: Fix leaks and checksum errors in transmit code path	2009-04-17 11:06:31 -07:00
uc2322	Staging: aten2011: Clean up some tty bits	2009-04-17 11:06:26 -07:00
usbip	Staging: BUG to BUG_ON changes	2009-04-03 14:54:26 -07:00
winbond	Staging: w35und: unregister device from the ieee80211 stack upon ->disconnect()	2009-05-08 19:39:27 -07:00
wlan-ng	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2009-04-05 11:06:45 -07:00
Makefile	Staging: add USB serial Quatech driver	2009-04-03 14:54:27 -07:00
staging.c	Staging: workaround build system bug	2008-10-13 14:32:52 -07:00