lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7a6362800c
linux-kernel-test/drivers/staging
History
Linus Torvalds 7a6362800c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)
  bonding: enable netpoll without checking link status
  xfrm: Refcount destination entry on xfrm_lookup
  net: introduce rx_handler results and logic around that
  bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
  bonding: wrap slave state work
  net: get rid of multiple bond-related netdevice->priv_flags
  bonding: register slave pointer for rx_handler
  be2net: Bump up the version number
  be2net: Copyright notice change. Update to Emulex instead of ServerEngines
  e1000e: fix kconfig for crc32 dependency
  netfilter ebtables: fix xt_AUDIT to work with ebtables
  xen network backend driver
  bonding: Improve syslog message at device creation time
  bonding: Call netif_carrier_off after register_netdevice
  bonding: Incorrect TX queue offset
  net_sched: fix ip_tos2prio
  xfrm: fix __xfrm_route_forward()
  be2net: Fix UDP packet detected status in RX compl
  Phonet: fix aligned-mode pipe socket buffer header reserve
  netxen: support for GbE port settings
  ...

Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
with the staging updates.
2011-03-16 16:29:25 -07:00
..
asus_oled
ath6kl ath6kl: remove-typedef HIF_DEVICE 2011-03-14 11:58:57 -07:00
bcm staging: bcm: Remove NULL check before kfree 2011-03-14 11:57:30 -07:00
brcm80211 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-03-16 16:29:25 -07:00
comedi staging: comedi: Remove NULL check before kfree 2011-03-14 11:57:31 -07:00
cptm1217
crystalhd staging: crystalhd: fix memory leaks 2011-03-14 12:23:34 -07:00
cs5535_gpio
cx25821 staging: cx25821: Remove NULL check before kfree 2011-03-14 11:57:31 -07:00
cxt1e1
dabusb
dt3155v4l
easycap staging/easycap: reduce code nesting in easycap_sound.c 2011-03-07 13:52:57 -08:00
echo staging: echo: fix a typo ("overflow") 2011-03-02 16:03:59 -05:00
et131x staging/et131x: fix et131x_rx_dma_disable halt_status usage 2011-02-23 14:39:09 -08:00
frontier
ft1000 staging: ft1000: Fix coding style in ft1000_proc_drvmsg function. 2011-03-14 11:51:21 -07:00
generic_serial Staging: generic_serial: fix double locking bug 2011-02-28 13:21:20 -08:00
gma500 staging: gma500: fix build errors 2011-03-07 13:28:47 -08:00
go7007 staging: go7007: Remove NULL check before kfree 2011-03-14 11:57:32 -07:00
hv staging: hv: fix memory leaks 2011-03-14 12:38:15 -07:00
iio Staging: IIO: DAC: AD5624R: Consistency cleanup - no functional changes 2011-03-14 12:21:28 -07:00
intel_sst
keucr staging: keucr: Remove NULL check before kfree 2011-03-14 11:57:32 -07:00
line6 staging: line6: Remove NULL check before kfree 2011-03-14 11:57:33 -07:00
lirc staging: lirc: fix for "lirc_dev: lirc_register_driver: driver pointer must be not NULL!" 2011-03-07 13:23:26 -08:00
memrar
msm
octeon
olpc_dcon staging: fix olpc_dcon kconfig and build errors 2011-02-23 14:39:10 -08:00
panel
phison
pohmelfs Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-03-16 16:29:25 -07:00
quatech_usb2 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-03-16 15:19:35 -07:00
quickstart
rt2860 staging: rt2860: Remove NULL check before kfree 2011-03-14 11:57:33 -07:00
rt2870
rtl8187se staging: rtl8187se: Remove NULL check before kfree 2011-03-14 11:57:34 -07:00
rtl8192e staging: rtl8192e: Don't copy dev pointer to skb 2011-03-14 12:24:48 -07:00
rtl8192u staging: rtl8192u: Remove NULL check before kfree 2011-03-14 11:57:35 -07:00
rtl8712 staging: rtl8712: Remove NULL check before kfree 2011-03-14 11:57:35 -07:00
rts_pstor staging: rts_pstor: MSXC card power class 2011-03-09 16:01:29 -08:00
samsung-laptop Staging: samsung-laptop: add support for N230 model 2011-03-11 14:32:01 -08:00
sbe-2t3e3
se401
sep staging: sep: remove unused ioctls 2011-03-07 13:42:34 -08:00
serqt_usb2 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-03-16 15:19:35 -07:00
slicoss
sm7xx
solo6x10
speakup staging: speakup: Remove NULL check before kfree 2011-03-14 11:57:36 -07:00
spectra staging: spectra: optimize kmalloc to kzalloc 2011-03-09 15:54:32 -08:00
ste_rmi4 staging: ste_rmi4: fix memory leaks 2011-03-14 12:22:54 -07:00
tidspbridge staging: tidspbridge: protect dmm_map properly 2011-03-14 12:22:27 -07:00
tm6000
tty tty: move cd1865.h to drivers/staging/tty/ 2011-03-07 12:04:50 -08:00
usbip Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-03-16 15:19:35 -07:00
usbvideo
vme staging: vme: Remove NULL check before kfree 2011-03-14 11:57:37 -07:00
vt6655 staging: vt6655: Remove NULL check before kfree 2011-03-14 11:57:37 -07:00
vt6656 staging: vt6656: Remove NULL check before kfree 2011-03-14 11:57:37 -07:00
westbridge drivers:staging:westbridge:astoria Remove one to many n's in a word. 2011-02-28 19:00:29 -08:00
winbond Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-03-16 16:29:25 -07:00
wlags49_h2
wlags49_h25
wlan-ng staging: wlan-ng: Remove NULL check before kfree 2011-03-14 11:57:38 -07:00
xgifb staging: xgifb: clean up register function variable names 2011-03-14 11:52:34 -07:00
zcache staging: Allow sharing xvmalloc for zram and zcache 2011-02-23 14:02:56 -08:00
zram staging: Allow sharing xvmalloc for zram and zcache 2011-02-23 14:02:56 -08:00
Kconfig Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-03-16 15:19:35 -07:00
Makefile Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-03-16 15:19:35 -07:00
staging.c