linux/drivers/staging
David S. Miller 9f6ec8d697 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
	drivers/net/wireless/rtlwifi/pci.c
	net/netfilter/ipvs/ip_vs_core.c
2011-06-20 22:29:08 -07:00
..
altera-stapl Staging: altera: move .h file to proper place 2011-06-07 12:19:14 -07:00
asus_oled
ath6kl staging: ath6kl: Fix a kernel panic during suspend/resume 2011-06-07 12:28:42 -07:00
bcm
brcm80211 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-06-20 22:29:08 -07:00
comedi Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 2011-05-24 13:28:35 -07:00
cptm1217
crystalhd
cs5535_gpio
cx25821
cxd2099
cxt1e1
dt3155v4l
easycap
echo
et131x
frontier
ft1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 2011-05-24 13:28:35 -07:00
generic_serial Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 2011-05-26 13:19:00 -07:00
gma500 staging: gma500: get control from firmware framebuffer if conflicts 2011-06-07 12:28:42 -07:00
go7007
hv
iio staging: fix iio builds when IIO_RING_BUFFER is not enabled 2011-06-16 08:29:00 -07:00
intel_sst Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-05-23 12:49:28 -07:00
keucr
line6
lirc Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-05-23 21:12:49 -07:00
mei Staging: mei: fix debug code 2011-06-09 10:07:47 -07:00
msm
nvec
octeon
olpc_dcon staging: fix olpc_dcon build, needs BACKLIGHT_CLASS_DEVICE 2011-06-07 12:28:39 -07:00
panel
phison
pohmelfs sanitize <linux/prefetch.h> usage 2011-05-20 12:50:29 -07:00
quatech_usb2
quickstart
rtl8187se net/staging: add needed interrupt.h and hardirq.h includes 2011-06-19 22:41:59 -07:00
rtl8192e net/staging: add needed interrupt.h and hardirq.h includes 2011-06-19 22:41:59 -07:00
rtl8192u net/staging: add needed interrupt.h and hardirq.h includes 2011-06-19 22:41:59 -07:00
rtl8712
rts_pstor staging: rts_pstor: use bitwise operator instead of logical one 2011-06-07 12:28:40 -07:00
sbe-2t3e3
sep
serqt_usb2
slicoss
sm7xx
solo6x10
speakup
spectra
ste_rmi4
tidspbridge
tm6000 [media] tm6000: fix uninitialized field, change prink to dprintk 2011-05-21 07:24:19 -03:00
tty Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-05-23 12:49:28 -07:00
usbip staging: usbip: bugfix prevent driver unbind 2011-06-07 12:28:41 -07:00
vme
vt6655
vt6656
westbridge
winbond
wlags49_h2
wlags49_h25
wlan-ng Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2011-05-24 16:47:54 -04:00
xgifb
zcache vmscan: change shrinker API by passing shrink_control struct 2011-05-25 08:39:26 -07:00
zram
Kconfig Staging: remove STAGING_EXCLUDE_BUILD option 2011-06-07 12:23:57 -07:00
Makefile
staging.c