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
..
agp	agp: intel-agp: do not use PCI resources before pci_enable_device()	2010-08-05 12:28:25 +10:00
hw_random	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-05 15:57:35 -07:00
ip2	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
ipmi	ipmi: set schedule_timeout_wait() value back to one	2010-06-29 15:29:31 -07:00
mwave
pcmcia	pcmcia: use struct resource for PCMCIA devices, part 2	2010-08-03 09:04:16 +02:00
rio	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
tpm	tpm_tis: fix subsequent suspend failures	2010-07-26 10:25:45 +10:00
xilinx_hwicap	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
.gitignore
amiserial.c	m68k: amiga - Serial port platform device conversion	2010-05-26 19:51:09 +02:00
apm-emulation.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
applicom.c	drivers/char/applicom.c: use memdup_user	2010-05-27 09:12:50 -07:00
applicom.h
bfin_jtag_comm.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
bfin-otp.c
briq_panel.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
bsr.c	of/address: Clean up function declarations	2010-08-01 01:42:42 -06:00
cd1865.h
consolemap.c
cp437.uni
cs5535_gpio.c
cyclades.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
defkeymap.c_shipped
defkeymap.map
digi1.h
digiFep1.h
digiPCI.h
ds1302.c
ds1620.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
dsp56k.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dtlk.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
efirtc.c
epca.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
epca.h
epcaconfig.h
generic_nvram.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
generic_serial.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
genrtc.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
hangcheck-timer.c	hangcheck-timer: fix x86_32 bugs	2010-05-25 08:07:02 -07:00
hpet.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
hvc_beat.c
hvc_console.c	hvc_console: use "*_console" nomenclature to avoid modpost warning.	2010-07-09 11:28:24 +10:00
hvc_console.h
hvc_irq.c
hvc_iseries.c	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
hvc_iucv.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
hvc_rtas.c
hvc_udbg.c
hvc_vio.c
hvc_xen.c
hvcs.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
hvsi.c	hvc_console: use "*_console" nomenclature to avoid modpost warning.	2010-07-09 11:28:24 +10:00
i8k.c	procfs: Push down the bkl from ioctl	2010-05-17 03:06:12 +02:00
isicom.c	serial: isicomm: handle running out of slots	2010-05-21 09:34:30 -07:00
istallion.c	tty: Fix regressions in the char driver conversion	2010-04-30 09:20:33 -07:00
Kconfig	ramoops: add HAS_IOMEM dependency	2010-06-04 15:21:44 -07:00
keyboard.c	Input: keyboard - also match braille-only keyboards	2010-07-31 02:29:31 -07:00
lp.c
Makefile	char drivers: RAM oops/panic logger	2010-05-27 09:12:50 -07:00
mbcs.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
mbcs.h
mem.c	Fix init ordering of /dev/console vs callers of modprobe	2010-08-06 09:17:02 -07:00
misc.c	drivers: misc: pass miscdevice pointer via file private data	2010-05-25 08:07:03 -07:00
mmtimer.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
moxa.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
moxa.h
mspec.c
mxser.c	tty: Fix regressions in the char driver conversion	2010-04-30 09:20:33 -07:00
mxser.h
n_gsm.c	TTY/n_gsm: potential double lock	2010-06-04 13:37:17 -07:00
n_hdlc.c
n_r3964.c
n_tty.c	ldisc n_tty: add new method n_tty_inherit_ops()	2010-03-12 15:52:43 -08:00
nozomi.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
nsc_gpio.c
nvram.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
nwbutton.c
nwbutton.h
nwflash.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
pc8736x_gpio.c
ppdev.c	drivers/char/ppdev.c: use kasprintf	2010-05-27 09:12:50 -07:00
ps3flash.c	drop unused dentry argument to ->fsync	2010-05-27 22:05:02 -04:00
pty.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ramoops.c	char drivers: RAM oops/panic logger	2010-05-27 09:12:50 -07:00
random.c	random: Reorder struct entropy_store to remove padding on 64bits	2010-07-31 19:58:00 +08:00
raw.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
riscom8_reg.h
riscom8.c	tty: Fix regressions in the char driver conversion	2010-04-30 09:20:33 -07:00
riscom8.h
rocket_int.h
rocket.c
rocket.h
rtc.c
scc.h
scx200_gpio.c
selection.c
ser_a2232.c
ser_a2232.h
ser_a2232fw.ax
ser_a2232fw.h
serial167.c	serial: Tidy REMOTE_DEBUG	2010-05-21 09:34:31 -07:00
snsc_event.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
snsc.c
snsc.h
sonypi.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
specialix_io8.h
specialix.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
stallion.c	tty: Fix regressions in the char driver conversion	2010-04-30 09:20:33 -07:00
sx.c
sx.h
sxboards.h
sxwindow.h
synclink_gt.c	synclink: use ARRAY_SIZE	2010-07-20 17:04:11 +02:00
synclink.c	Char: synclink, remove unnecessary checks	2010-03-02 14:43:16 -08:00
synclinkmp.c
sysrq.c	sysrq,kdb: Use __handle_sysrq() for kdb's sysrq function	2010-07-21 19:27:07 -05:00
tb0219.c
tlclk.c
toshiba.c
tty_audit.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
tty_buffer.c	tty: fix obsolete comment on tty_insert_flip_string_fixed_flag	2010-05-21 09:34:30 -07:00
tty_io.c	Fix init ordering of /dev/console vs callers of modprobe	2010-08-06 09:17:02 -07:00
tty_ioctl.c
tty_ldisc.c	tty: Fix the ldisc hangup race	2010-03-02 14:43:22 -08:00
tty_port.c	tty_port,usb-console: Fix usb serial console open/close regression	2010-03-19 07:17:57 -07:00
uv_mmtimer.c
vc_screen.c
viotape.c	of: Always use 'struct device.of_node' to get device node pointer.	2010-05-18 16:10:44 -06:00
virtio_console.c	virtio: console: Fix crash when port is unplugged and blocked for write	2010-06-03 22:39:19 +09:30
vme_scc.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
vt_ioctl.c	vt_ioctl: return -EFAULT on copy_from_user errors	2010-06-04 13:37:18 -07:00
vt.c	vt,console,kdb: automatically set kdb LINES variable	2010-08-05 09:22:30 -05:00