tmp_suning_uos_patched/drivers/char
Chris Wilson 8a327f23e2 Merge remote branch 'linus/master' into drm-intel-fixes
Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().

Conflicts:
	drivers/gpu/drm/i915/intel_ringbuffer.c
2011-01-24 18:27:32 +00:00
..
agp drm/i915,agp/intel: Do not clear stolen entries 2011-01-24 18:26:25 +00:00
hw_random Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2011-01-13 10:25:58 -08:00
ip2
ipmi Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2011-01-13 20:15:35 -08:00
mwave
pcmcia
rio
tpm tpm: fix panic caused by "tpm: Autodetect itpm devices" 2011-01-24 11:29:55 +11:00
xilinx_hwicap
amiserial.c
apm-emulation.c
applicom.c
applicom.h
bfin_jtag_comm.c
bfin-otp.c
briq_panel.c
bsr.c
cd1865.h
cyclades.c
digi1.h
digiFep1.h
digiPCI.h
ds1302.c
ds1620.c
dsp56k.c
dtlk.c
efirtc.c
epca.c
epca.h
epcaconfig.h
generic_nvram.c
generic_serial.c
genrtc.c
hangcheck-timer.c
hpet.c
i8k.c
isicom.c
istallion.c
Kconfig Merge branch 'akpm' 2011-01-20 17:02:14 -08:00
lp.c
Makefile tty: move hvc drivers to drivers/tty/hvc/ 2011-01-13 12:03:00 -08:00
mbcs.c
mbcs.h
mem.c
misc.c
mmtimer.c
moxa.c
moxa.h
mspec.c
mxser.c
mxser.h
nozomi.c
nsc_gpio.c
nvram.c
nwbutton.c
nwbutton.h
nwflash.c
pc8736x_gpio.c
ppdev.c
ps3flash.c
ramoops.c ramoops: fix types, remove typecasts 2011-01-13 08:03:23 -08:00
random.c
raw.c
riscom8_reg.h
riscom8.c
riscom8.h
rocket_int.h
rocket.c
rocket.h
rtc.c
scc.h
scx200_gpio.c
ser_a2232.c
ser_a2232.h
ser_a2232fw.ax
ser_a2232fw.h
serial167.c
snsc_event.c
snsc.c
snsc.h
sonypi.c
specialix_io8.h
specialix.c
stallion.c
sx.c
sx.h
sxboards.h
sxwindow.h
synclink_gt.c
synclink.c
synclinkmp.c
tb0219.c
tlclk.c
toshiba.c
ttyprintk.c
uv_mmtimer.c
viotape.c
vme_scc.c