kevin/linux
1
Fork 0
Code
851b29cb3b
linux/drivers/staging
History
Linus Torvalds 1685e633b3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq
  pcmcia: do not request windows if you don't need to
  pcmcia: insert PCMCIA device resources into resource tree
  pcmcia: export resource information to sysfs
  pcmcia: use struct resource for PCMCIA devices, part 2
  pcmcia: remove memreq_t
  pcmcia: move local definitions out of include/pcmcia/cs.h
  pcmcia: do not use io_req_t when calling pcmcia_request_io()
  pcmcia: do not use io_req_t after call to pcmcia_request_io()
  pcmcia: use struct resource for PCMCIA devices
  pcmcia: clean up cs.h
  pcmcia: use pcmica_{read,write}_config_byte
  pcmcia: remove cs_types.h
  pcmcia: remove unused flag, simplify headers
  pcmcia: remove obsolete CS_EVENT_ definitions
  pcmcia: split up central event handler
  pcmcia: simplify event callback
  pcmcia: remove obsolete ioctl

Conflicts in:
 - drivers/staging/comedi/drivers/*
 - drivers/staging/wlags49_h2/wl_cs.c
due to dev_info_t and whitespace changes
2010-08-06 12:25:06 -07:00
..
adis16255 Staging: adis16255: missing spacess in log messages added 2010-06-18 15:16:20 -07:00
asus_oled
batman-adv Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
comedi Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 2010-08-06 12:25:06 -07:00
crystalhd Staging: autoconvert trivial BKL users to private mutex 2010-07-22 11:10:29 -07:00
cx25821 Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
cxt1e1 Staging: cxt1e1: remove code guarded by GENERIC_HDLC_VERSION 2010-06-18 15:20:59 -07:00
dream Staging: dream: pmem: remove casts from void* 2010-07-08 13:49:36 -07:00
dt3155v4l Staging: dt3155v4l: correcting a pointer mismatch bug and cleanups 2010-06-18 16:50:04 -07:00
easycap Staging: Remove unnecessary casts of private_data 2010-07-22 14:43:51 -07:00
echo
et131x
frontier
go7007
hv Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
iio staging: iio: ring_sw Fix pointer arithmetic for 64bit arches by using phys_addr_t 2010-08-02 17:06:04 -07:00
line6 Staging: line6: needs to select SND_PCM 2010-07-28 08:20:55 -07:00
lirc V4L/DVB: staging/lirc: CodingStyle cleanups 2010-08-02 16:43:35 -03:00
memrar Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
mrst-touchscreen Staging: mrst-touchscreen: fix dereferencing free memory 2010-06-30 08:18:14 -07:00
msm staging: msm: remove video drivers for obsolete platforms 2010-07-26 15:39:31 -07:00
octeon Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
otus Staging: comedi : fix brace coding style issue in wwrap.c 2010-08-02 18:27:42 -07:00
panel staging: panel: fix error path 2010-08-02 18:23:45 -07:00
phison
pohmelfs Staging: fix typos concerning "address" 2010-07-22 14:43:10 -07:00
quatech_usb2 Staging: quatech_usb2: remove unused qt2_box_flush function 2010-08-02 18:25:27 -07:00
quickstart Staging: quickstart: depends on INPUT 2010-08-02 18:12:46 -07:00
rt2860 Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
rt2870
rtl8187se Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
rtl8192e staging: rtl8192e: Delete some redundant code 2010-07-26 15:45:12 -07:00
rtl8192su Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
rtl8192u Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
samsung-laptop
sep Staging: fix typos concerning "address" 2010-07-22 14:43:10 -07:00
serqt_usb2
slicoss Staging: slicoss: Remove net_device_stats from the driver's private 2010-08-02 18:25:26 -07:00
sm7xx staging: sm7xx: Fixup of the section mismatch 2010-07-22 14:32:59 -07:00
solo6x10 Staging: solo: add delay.h header 2010-07-08 13:57:58 -07:00
spectra Staging: spectra: remove non existing blk_fs_request wrapper 2010-06-25 11:11:22 -07:00
ti-st Staging: ti-st: update TODO 2010-08-02 18:28:40 -07:00
tidspbridge staging: ti dspbridge: avoid errors if stream id is zero 2010-08-02 17:11:03 -07:00
tm6000 V4L/DVB: tm6000-input: Make checkpatch.pl happy 2010-08-02 15:29:35 -03:00
udlfb
usbip Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
vme Staging: autoconvert trivial BKL users to private mutex 2010-07-22 11:10:29 -07:00
vt6655 Staging: vt6655: replace BOOL with in kernel bool 2010-08-02 18:17:57 -07:00
vt6656 staging: vt6656: removed NTSTATUS definition 2010-08-02 18:19:04 -07:00
winbond Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
wlags49_h2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 2010-08-06 12:25:06 -07:00
wlags49_h25
wlan-ng Staging: wlan-ng: Update prism2_set_tx_power() to use mBm 2010-08-05 14:18:29 -07:00
xgifb Staging: xgifb: increase VBIOS_VER_MAX_LENGTH to 5 2010-06-22 14:33:36 -07:00
zram Staging: zram: fix build errors, depends on BLOCK 2010-06-24 14:15:07 -07:00
Kconfig Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
Makefile Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
staging.c