iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
b2e5cd33b5
linux/drivers/staging
History
Linus Torvalds 06f4e926d2 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: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.
2011-05-20 13:43:21 -07:00
..
altera-stapl [media] staging: altera-jtag needs delay.h 2011-03-31 18:49:34 -03:00
asus_oled Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
ath6kl Fix common misspellings 2011-03-31 11:26:23 -03:00
bcm Fix common misspellings 2011-03-31 11:26:23 -03:00
brcm80211 Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
comedi Fix common misspellings 2011-03-31 11:26:23 -03:00
cptm1217 Fix common misspellings 2011-03-31 11:26:23 -03:00
crystalhd Fix common misspellings 2011-03-31 11:26:23 -03:00
cs5535_gpio staging: cs5535_gpio: check put_user() return code 2011-01-21 12:35:14 -08:00
cx25821 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
cxd2099 [media] ngene: Fix compilation when cxd2099 is not enabled 2011-03-21 20:31:48 -03:00
cxt1e1 Fix common misspellings 2011-03-31 11:26:23 -03:00
dt3155v4l [media] V4L: remove V4L1 compatibility mode 2010-12-29 08:17:07 -02:00
easycap Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
echo staging: echo: fix a typo ("overflow") 2011-03-02 16:03:59 -05:00
et131x Fix common misspellings 2011-03-31 11:26:23 -03:00
frontier Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
ft1000 staging: ft1000: Remove unnecessary EXPORT_SYMBOLs 2011-04-25 17:08:31 -07:00
generic_serial Fix common misspellings 2011-03-31 11:26:23 -03:00
gma500 staging: gma500: Depend on X86 2011-04-25 17:08:30 -07:00
go7007 Fix common misspellings 2011-03-31 11:26:23 -03:00
hv Staging: convert hv network driver to hw_features 2011-04-20 01:30:40 -07:00
iio Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
intel_sst staging: intel_sst: intelmid needs delay.h 2011-04-25 17:44:09 -07:00
keucr Fix common misspellings 2011-03-31 11:26:23 -03:00
line6 staging: line6: Remove NULL check before kfree 2011-03-14 11:57:33 -07:00
lirc Fix common misspellings 2011-03-31 11:26:23 -03:00
msm Fix common misspellings 2011-03-31 11:26:23 -03:00
octeon Fix common misspellings 2011-03-31 11:26:23 -03:00
olpc_dcon staging: olpc: Add <linux/delay.h> 2011-04-25 17:08:29 -07:00
panel
phison Staging: phison: use DEFINE_PCI_DEVICE_TABLE 2010-12-09 16:29:48 -08:00
pohmelfs sanitize <linux/prefetch.h> usage 2011-05-20 12:50:29 -07:00
quatech_usb2 Fix common misspellings 2011-03-31 11:26:23 -03:00
quickstart Staging: quickstart: fixed coding style issues 2011-02-09 12:11:55 -08:00
rt2860 Revert wrong fixes for common misspellings 2011-04-26 23:31:11 -07:00
rt2870 Fix common misspellings 2011-03-31 11:26:23 -03:00
rtl8187se Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
rtl8192e Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
rtl8192u Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
rtl8712 Fix common misspellings 2011-03-31 11:26:23 -03:00
rts_pstor staging: rts_pstor: use #ifdef instead of #if 2011-04-25 17:08:31 -07:00
sbe-2t3e3
sep Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07: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 Fix common misspellings 2011-03-31 11:26:23 -03:00
sm7xx Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
solo6x10 staging: solo6x10: add select SND_PCM to fix build error 2011-04-25 17:44:09 -07:00
speakup Fix common misspellings 2011-03-31 11:26:23 -03:00
spectra Revert wrong fixes for common misspellings 2011-04-26 23:31:11 -07:00
ste_rmi4 Fix common misspellings 2011-03-31 11:26:23 -03:00
tidspbridge Revert wrong fixes for common misspellings 2011-04-26 23:31:11 -07:00
tm6000 Fix common misspellings 2011-03-31 11:26:23 -03:00
tty Revert wrong fixes for common misspellings 2011-04-26 23:31:11 -07:00
usbip Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-05-04 14:23:41 -07:00
vme Fix common misspellings 2011-03-31 11:26:23 -03:00
vt6655 Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
vt6656 Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
westbridge Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
winbond Fix common misspellings 2011-03-31 11:26:23 -03:00
wlags49_h2 Fix common misspellings 2011-03-31 11:26:23 -03:00
wlags49_h25 Fix common misspellings 2011-03-31 11:26:23 -03:00
wlan-ng staging: Remove a warning for drivers/staging/wlan-ng/cfg80211.c 2011-05-03 12:52:00 -07:00
xgifb Fix common misspellings 2011-03-31 11:26:23 -03: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 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86 2011-04-12 15:24:23 -07:00
Makefile Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86 2011-04-12 15:24:23 -07:00
staging.c