David S. Miller ea2aca084b Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wan/hdlc_fr.c drivers/net/wireless/iwlwifi/iwl-4965.c drivers/net/wireless/iwlwifi/iwl3945-base.c		2008-07-05 23:08:07 -07:00
..
agp	[agp]: fixup chipset flush for new Intel G4x.	2008-06-20 11:48:06 +10:00
drm	DRM/i915: only use tiled blits on 965+	2008-07-02 18:42:23 -07:00
hw_random	intel_rng: make device not found a warning	2008-06-12 18:05:41 -07:00
ip2	ip2: fix crashes on load/unload	2008-05-24 09:56:11 -07:00
ipmi	ipmi: support I/O resources in OF driver	2008-05-14 19:11:14 -07:00
mwave	arm/mach-integrator/time.c, mwave: revert portions of recent irq cleanups	2008-04-24 08:35:37 -04:00
pcmcia	WAN: convert drivers to use built-in netdev_stats	2008-07-04 08:47:41 -04:00
rio	drivers/char: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:54 -07:00
tpm	tpm: change Kconfig dependencies from PNPACPI to PNP	2008-04-29 08:06:26 -07:00
xilinx_hwicap	[POWERPC] Xilinx: Fix compile warnings	2008-05-01 23:09:42 -05:00
.gitignore	…
ChangeLog	…
Kconfig	rtc: make HPET_RTC_IRQ track HPET_EMULATE_RTC	2008-06-12 18:05:42 -07:00
Makefile	Blackfin char driver for Blackfin on-chip OTP memory (v3)	2008-04-25 08:04:56 +08:00
amiserial.c	amiserial: Switch put char to return success/fail	2008-04-30 08:29:45 -07:00
apm-emulation.c	proc: switch /proc/apm to seq_file interface	2008-04-29 08:06:19 -07:00
applicom.c	char serial: switch drivers to ioremap_nocache	2008-04-30 08:29:48 -07:00
applicom.h	…
bfin-otp.c	Blackfin char driver for Blackfin on-chip OTP memory (v3)	2008-04-25 08:04:56 +08:00
briq_panel.c	[POWERPC] Remove dead code for preventing pread() and pwrite() calls	2007-07-10 22:03:26 +10:00
cd1865.h	…
consolemap.c	Basic braille screen reader support	2008-04-30 08:29:52 -07:00
cp437.uni	…
cs5535_gpio.c	drivers: fix integer as NULL pointer warnings	2008-04-28 17:31:13 -07:00
cyclades.c	drivers/char: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:54 -07:00
defkeymap.c_shipped	Fix default compose table initialization	2008-03-03 14:53:16 -08:00
defkeymap.map	…
digi1.h	…
digiFep1.h	…
digiPCI.h	…
ds1286.c	drivers/char/ds1286.c: use time_before, time_before_eq, etc	2008-04-30 08:29:45 -07:00
ds1302.c	…
ds1620.c	header cleaning: don't include smp_lock.h when not used	2007-05-08 11:15:07 -07:00
dsp56k.c	long vs. unsigned long - low-hanging fruits in drivers	2007-10-14 12:41:51 -07:00
dtlk.c	dtlk: fix error checks in module_init()	2007-05-08 11:15:09 -07:00
efirtc.c	drivers/char/: Spelling fixes	2008-02-03 17:11:42 +02:00
epca.c	epca: coding style	2008-04-30 08:29:47 -07:00
epca.h	Char: char/serial, remove SERIAL_TYPE_NORMAL redefines	2008-02-07 08:42:33 -08:00
epcaconfig.h	…
esp.c	drivers/char: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:54 -07:00
generic_nvram.c	driver/char/generic_nvram: fix banner	2008-06-12 18:05:41 -07:00
generic_serial.c	drivers/char: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:54 -07:00
genrtc.c	Char: genrtc, use wait_event_interruptible	2007-07-16 09:05:44 -07:00
hangcheck-timer.c	drivers/char/: Spelling fixes	2008-02-03 17:11:42 +02:00
hpet.c	drivers/char: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:54 -07:00
hvc_beat.c	[POWERPC] hvcbeat: Fix buffer manipulation	2008-04-17 07:46:10 +10:00
hvc_console.c	drivers/char: use LIST_HEAD instead of LIST_HEAD_INIT	2008-02-06 10:41:07 -08:00
hvc_console.h	…
hvc_iseries.c	[POWERPC] init and exit markings for hvc_iseries	2007-07-22 21:30:59 +10:00
hvc_rtas.c	[POWERPC] hvc_rtas_init() must be __init	2008-02-14 22:11:02 +11:00
hvc_vio.c	…
hvc_xen.c	xen: use the hvc console infrastructure for Xen console	2007-07-18 08:47:44 -07:00
hvcs.c	drivers/char: use LIST_HEAD instead of LIST_HEAD_INIT	2008-02-06 10:41:07 -08:00
hvsi.c	drivers/char: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:54 -07:00
i8k.c	i8k: make fan multiplier tunable with a module parameter	2008-05-01 08:04:00 -07:00
ip27-rtc.c	ip27-rtc: convert ioctl to unlocked_ioctl	2008-02-06 10:41:14 -08:00
isicom.c	isicom: fix buffer allocation	2008-04-30 08:29:47 -07:00
istallion.c	char serial: switch drivers to ioremap_nocache	2008-04-30 08:29:48 -07:00
keyboard.c	console keyboard mapping broken by 04c71976	2008-06-12 18:05:41 -07:00
lcd.c	[MIPS] Delete duplicate inclusion of <linux/delay.h>.	2007-08-27 02:16:59 +01:00
lcd.h	…
lp.c	Parallel port: convert port_mutex to the mutex API	2008-02-06 10:41:01 -08:00
mbcs.c	MBCS: convert dmareadlock to mutex	2008-02-07 08:42:25 -08:00
mbcs.h	MBCS: convert dmareadlock to mutex	2008-02-07 08:42:25 -08:00
mem.c	make /dev/kmem a config option	2008-04-29 08:05:59 -07:00
misc.c	drivers: use non-racy method for proc entries creation	2008-04-29 08:06:22 -07:00
mmtimer.c	remove div_long_long_rem	2008-05-01 08:03:58 -07:00
moxa.c	char serial: switch drivers to ioremap_nocache	2008-04-30 08:29:48 -07:00
moxa.h	Char: moxa, cleanup rx/tx	2008-04-30 08:29:43 -07:00
mspec.c	[IA64] allocate multiple contiguous pages via uncached allocator	2008-04-29 13:49:01 -07:00
mxser.c	mxser: convert large macros to functions	2008-04-30 08:29:49 -07:00
mxser.h	mxser: convert large macros to functions	2008-04-30 08:29:49 -07:00
n_hdlc.c	tty: The big operations rework	2008-04-30 08:29:47 -07:00
n_r3964.c	tty: The big operations rework	2008-04-30 08:29:47 -07:00
n_tty.c	tty: fix BKL related leak and crash	2008-05-15 10:19:30 -07:00
nozomi.c	drivers/char: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:54 -07:00
nsc_gpio.c	…
nvram.c	COBALT: remove all references to Cobalt NVRAM	2007-07-16 09:05:47 -07:00
nwbutton.c	…
nwbutton.h	…
nwflash.c	…
pc8736x_gpio.c	…
ppdev.c	[PARPORT] Remove unused 'irq' argument from parport irq functions	2007-10-23 19:53:16 -04:00
ps3flash.c	ps3: FLASH ROM Storage Driver	2007-07-21 17:49:16 -07:00
pty.c	pty: prepare for tty->ops changes	2008-04-30 08:29:46 -07:00
random.c	random: add async notification support to /dev/random	2008-04-29 08:06:25 -07:00
raw.c	cdev: remove unneeded setting of cdev names	2007-10-12 14:51:02 -07:00
riscom8.c	drivers/char: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:54 -07:00
riscom8.h	Char: riscom8, remove wakeup and hangup bottomhalves	2008-02-07 08:42:34 -08:00
riscom8_reg.h	…
rocket.c	riscom/rocket: switch to int put_char method	2008-04-30 08:29:46 -07:00
rocket.h	…
rocket_int.h	char: use get_unaligned_* helpers	2008-04-29 08:06:27 -07:00
rtc.c	drivers: use non-racy method for proc entries creation	2008-04-29 08:06:22 -07:00
scc.h	…
scx200_gpio.c	…
selection.c	Kernel utf-8 handling	2007-07-16 09:05:46 -07:00
ser_a2232.c	Amiga serial driver: port_write_mutex fixup	2008-02-06 10:41:08 -08:00
ser_a2232.h	…
ser_a2232fw.ax	…
ser_a2232fw.h	…
serial167.c	m68k: serial167 missing return value in cy_put_char()	2008-05-05 12:37:02 -07:00
snsc.c	drivers/char: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:54 -07:00
snsc.h	Convert asm/semaphore.h users to linux/semaphore.h	2008-04-18 22:22:54 -04:00
snsc_event.c	byteorder: don't directly include linux/byteorder/generic.h	2008-05-16 12:01:45 -07:00
sonypi.c	drivers/char: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:54 -07:00
specialix.c	drivers/char: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:54 -07:00
specialix_io8.h	Char: specialix, remove bottomhalves	2008-02-07 08:42:34 -08:00
stallion.c	tty/serial: lay the foundations for the next set of reworks	2008-04-30 08:29:45 -07:00
sx.c	sx.c: fix printk warnings on sparc32	2008-05-08 10:46:56 -07:00
sx.h	Char: char/serial, remove SERIAL_TYPE_NORMAL redefines	2008-02-07 08:42:33 -08:00
sxboards.h	…
sxwindow.h	…
synclink.c	WAN: convert drivers to use built-in netdev_stats	2008-07-04 08:47:41 -04:00
synclink_gt.c	WAN: convert drivers to use built-in netdev_stats	2008-07-04 08:47:41 -04:00
synclinkmp.c	WAN: convert drivers to use built-in netdev_stats	2008-07-04 08:47:41 -04:00
sysrq.c	sparc64: Add global register dumping facility.	2008-05-20 00:33:45 -07:00
tb0219.c	…
tlclk.c	…
toshiba.c	toshiba: use ioremap_cached	2008-04-30 23:15:34 +02:00
tty_audit.c	[PATCH] split linux/file.h	2008-05-01 13:08:16 -04:00
tty_io.c	tty: Fix inverted logic in send_break	2008-07-02 19:21:48 -07:00
tty_ioctl.c	removed unused var real_tty on n_tty_ioctl()	2008-06-23 10:36:47 -07:00
vc_screen.c	use mutex instead of semaphore in virtual console driver	2007-05-08 11:15:33 -07:00
viocons.c	[POWERPC] iSeries: Remove unused mail address	2008-05-23 16:45:04 +10:00
viotape.c	[POWERPC] iSeries: Remove unused mail address	2008-05-23 16:45:04 +10:00
virtio_console.c	virtio: simplify config mechanism.	2008-02-04 23:49:57 +11:00
vme_scc.c	m68k vme_scc: avoid global namespace pollution	2008-05-18 13:28:48 -07:00
vr41xx_giu.c	[MIPS] Separate platform_device registration for VR41xx GPIO	2007-07-12 17:41:15 +01:00
vt.c	vt: fix vc_resize locking	2008-06-06 11:29:12 -07:00
vt_ioctl.c	vt_ioctl: Prepare for BKL push down	2008-04-30 08:29:40 -07:00