Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-20 01:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
d26a6aa08b
linux/drivers/staging
History
Linus Torvalds 3e74683137 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (345 commits)
  V4L/DVB (13542): ir-keytable: Allow dynamic table change
  V4L/DVB (13541): atbm8830: replace 64-bit division and floating point usage
  V4L/DVB (13540): ir-common: Cleanup get key evdev code
  V4L/DVB (13539): ir-common: add __func__ for debug messages
  V4L/DVB (13538): ir-common: Use a dynamic keycode table
  V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation
  V4L/DVB (13536): em28xx: Use the full RC5 code on HVR-950 Remote Controller
  V4L/DVB (13535): ir-common: Add a hauppauge new table with the complete RC5 code
  V4L/DVB (13534): ir-common: Remove some unused fields/structs
  V4L/DVB (13533): ir: use dynamic tables, instead of static ones
  V4L/DVB (13532): ir-common: Add infrastructure to use a dynamic keycode table
  V4L/DVB (13531): ir-common: rename the debug routine to allow exporting it
  V4L/DVB (13458): go7007: subdev conversion
  V4L/DVB (13457): s2250: subdev conversion
  V4L/DVB (13456): s2250: Change module structure
  V4L/DVB (13528): em28xx: add support for em2800 VC211A card
  em28xx: don't reduce scale to half size for em2800
  em28xx: don't load audio modules when AC97 is mis-detected
  em28xx: em2800 chips support max width of 640
  V4L/DVB (13523): dvb-bt8xx: fix compile warning
  ...

Fix up trivial conflicts due to spelling fixes from the trivial tree in
	Documentation/video4linux/gspca.txt
	drivers/media/video/cx18/cx18-mailbox.h
2009-12-09 19:50:49 -08:00
..
altpciechdma
android Staging: android: mark subsystem as broken 2009-10-30 14:47:44 -07:00
arlan Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2009-12-08 07:55:01 -08:00
asus_oled Staging: asus_oled: Cleaned up checkpatch issues. 2009-09-15 12:02:33 -07:00
b3dfg Staging: b3dfg: fix sched.h build breakage 2009-10-14 14:14:36 -07:00
comedi pcmcia: rework the irq_req_t typedef 2009-11-28 18:03:14 +01:00
cx25821 V4L/DVB (12851): cx25821/Makefile: Cleanup 2009-09-19 00:13:35 -03:00
dream Staging: dream: introduce missing kfree 2009-09-15 12:02:34 -07:00
dst Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block 2009-10-04 12:39:14 -07:00
echo
et131x Staging: et131x: Fix the add_10bit macro 2009-10-14 14:14:39 -07:00
frontier
go7007 V4L/DVB (13458): go7007: subdev conversion 2009-12-05 18:42:18 -02:00
hv Staging: hv: Fix some missing author names 2009-11-30 16:39:35 -08:00
iio staging: Complete sched.h removal from interrupt.h 2009-10-14 14:14:37 -07:00
line6 Staging: line6: ffzb returns an unsigned integer 2009-09-15 12:02:34 -07:00
mimio
netwave Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 2009-12-05 15:22:26 -08:00
octeon Staging: octeon-ethernet: Assign proper MAC addresses. 2009-11-23 18:55:34 +00:00
otus tree-wide: fix misspelling of "definition" in comments 2009-12-04 23:41:47 +01:00
p9auth Staging: p9auth: a few fixes 2009-10-09 13:47:24 -07:00
panel Staging: Panel: prevent driver from calling misc_deregister twice on same ressource 2009-10-30 14:47:43 -07:00
phison
poch Staging: poch: fix sched.h build breakage 2009-10-14 14:14:36 -07:00
pohmelfs writeback: remove unused nonblocking and congestion checks 2009-12-03 13:54:25 +01:00
quatech_usb2
rar
rt2860 Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
rt2870 Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
rt3070
rt3090 Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
rtl8187se Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
rtl8192e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
rtl8192su Merge branch 'for-next' into for-linus 2009-12-07 18:36:35 +01:00
sep staging: Complete sched.h removal from interrupt.h 2009-10-14 14:14:37 -07:00
serqt_usb2
slicoss
strip Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 2009-11-09 11:17:24 -08:00
udlfb
usbip
vme Staging: vme: fix sched.h build breakage 2009-10-14 14:14:36 -07:00
vt6655 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-12-01 22:13:38 -08:00
vt6656 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-12-01 22:13:38 -08:00
wavelan Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
winbond Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
wlan-ng Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
Kconfig Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
Makefile Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
staging.c