Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-06 20:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
be768912a4
linux/drivers/staging
History
Linus Torvalds 664a41b8a9 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (430 commits)
  [media] ir-mce_kbd-decoder: include module.h for its facilities
  [media] ov5642: include module.h for its facilities
  [media] em28xx: Fix DVB-C maxsize for em2884
  [media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
  [media] v4l: mt9v032: Fix Bayer pattern
  [media] V4L: mt9m111: rewrite set_pixfmt
  [media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
  [media] V4L: initial driver for ov5642 CMOS sensor
  [media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
  [media] V4L: soc-camera: remove soc-camera bus and devices on it
  [media] V4L: soc-camera: un-export the soc-camera bus
  [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
  [media] V4L: add media bus configuration subdev operations
  [media] V4L: soc-camera: group struct field initialisations together
  [media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
  [media] V4L: pxa-camera: switch to using standard PM hooks
  [media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
  [media] Don't OOPS if videobuf_dvb_get_frontend return NULL
  [media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
  [media] omap3isp: Support configurable HS/VS polarities
  ...

Fix up conflicts:
 - arch/arm/mach-omap2/board-rx51-peripherals.c:
     cleanup regulator supply definitions in mach-omap2
   vs
     OMAP3: RX-51: define vdds_csib regulator supply
 - drivers/staging/tm6000/tm6000-alsa.c (trivial)
2011-07-30 00:08:53 -07:00
..
altera-stapl Altera-stapl: Clean up makefile (-y instead of -objs) 2011-07-08 14:03:38 -07:00
asus_oled
ath6kl Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-07-28 05:58:19 -07:00
bcm Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
brcm80211 staging: brcm80211: Fix double include introduced by bad merge 2011-07-27 09:23:35 -07:00
comedi Staging: comedi: fix printk issue in rtd520.c 2011-07-08 14:11:18 -07:00
cptm1217 drivers/staging/cptm1217/clearpad_tm1217.c: Correct call to input_free_device 2011-05-18 14:30:49 -07:00
crystalhd
cx25821
cxd2099 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-07-30 00:08:53 -07:00
cxt1e1 Remove unneeded version.h include from drivers/staging/cxt1e1/sbecom_inline_linux.h 2011-07-05 10:39:39 -07:00
dt3155v4l staging: use videobuf2 framework for drivers/staging/dt3155v4l driver 2011-06-28 13:24:27 -07:00
easycap staging/easycap: remove oss support 2011-07-08 14:02:26 -07:00
echo drivers: staging: echo: Fix coding style issues. 2011-07-05 20:37:37 -07:00
et131x staging: et131x: remove unused prototype et131x_vlan_rx_register 2011-07-21 13:47:57 -07:00
frontier
ft1000 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
gma500 gma500: udelay(20000) it too long again 2011-07-26 11:55:14 -07:00
go7007
hv Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
iio staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register. 2011-07-18 13:25:23 -07:00
intel_sst sst: avoid unnecessary firmware reloading for MRST 2011-07-08 14:02:25 -07:00
keucr Staging: Remove ENE UB6250 MS card codes from keucr 2011-07-08 14:12:52 -07:00
line6 drivers/staging/line6/driver.c: Drop unneeded put functions. 2011-05-17 13:31:32 -07:00
lirc Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
mei staging: mei: reordering the exit module cleanup 2011-07-08 13:59:54 -07:00
nvec treewide: remove duplicate includes 2011-06-20 16:08:19 +02:00
octeon atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
olpc_dcon staging: fix olpc_dcon build, needs BACKLIGHT_CLASS_DEVICE 2011-06-07 12:28:39 -07:00
panel Remove unneeded version.h include from drivers/staging/panel/panel.c 2011-07-05 10:39:39 -07:00
phison
pohmelfs Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2011-07-22 19:02:39 -07:00
quatech_usb2
quickstart
rtl8187se Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
rtl8192e Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
rtl8192u Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
rtl8712 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
rts_pstor staging: rts_pstor: Fix a miswriting 2011-07-18 13:22:53 -07:00
sbe-2t3e3
sep Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
serqt_usb2
slicoss
sm7xx Staging: sm7xx: printk loglevels modified to match the scenario 2011-05-19 15:34:32 -07:00
solo6x10 atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
speakup Remove unneeded version.h includes from drivers/staging/speakup/ 2011-07-05 10:39:38 -07:00
spectra spectra: enable device before poking it 2011-07-18 13:22:53 -07:00
ste_rmi4 staging: ste_rmi4: remove cross-dependent platform data 2011-07-05 20:29:16 -07:00
tidspbridge atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
tm6000 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-07-30 00:08:53 -07:00
usbip staging: usbip: userspace: usbip-utils 1.1.1 2011-07-08 14:01:18 -07:00
vme Staging: VME: Introduce IOCTL to generate VME interrupts. 2011-06-28 14:13:05 -07:00
vt6655 staging: vt6655: Fix warnings if CONFIG_PM is not defined 2011-05-06 09:27:34 -07:00
vt6656 drivers/staging/vt6656/main_usb.c: Delete unnecessary call to usb_kill_urb 2011-05-17 11:37:57 -07:00
winbond atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
wlags49_h2 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
wlags49_h25
wlan-ng Remove unneeded version.h include from drivers/staging/wlan-ng/prism2sta.c 2011-07-05 10:39:38 -07:00
xgifb Remove unneeded version.h includes from drivers/staging/xgifb/ 2011-07-05 10:39:37 -07:00
zcache staging: zcache: support multiple clients, prep for KVM and RAMster 2011-07-08 14:18:53 -07:00
zram Staging: zram: Fix kunmapping order 2011-07-18 13:22:52 -07:00
Kconfig Staging: delete westbridge code 2011-07-12 04:53:56 +02:00
Makefile Staging: delete westbridge code 2011-07-12 04:53:56 +02:00
staging.c