sugar/linux
1
0
Fork 0
Code Activity
Files
8e934dbf264418afe4d1dff34ce074ecc14280db
linux/drivers/char
History
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
ip2: fix compiler warning on ip2main_pci_tbl
2010-12-10 15:20:15 -08:00
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
drivers/char/mwave/Makefile: clean up
2010-10-27 18:03:15 -07:00
pcmcia
pcmcia/ipwireless: don't use flush_scheduled_work()
2010-12-24 15:59:06 +01:00
rio
drivers/char/rio/Makefile: replace the use of <module>-objs with <module>-y
2010-10-27 18:03:15 -07:00
tpm
tpm: fix panic caused by "tpm: Autodetect itpm devices"
2011-01-24 11:29:55 +11:00
xilinx_hwicap
…
amiserial.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
apm-emulation.c
…
applicom.c
drivers/char/applicom.c: fix information leak to userland
2010-10-27 18:03:14 -07:00
applicom.h
…
bfin_jtag_comm.c
…
bfin-otp.c
…
briq_panel.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
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
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
i8k.c
Fix gcc 4.5.1 miscompiling drivers/char/i8k.c (again)
2010-11-15 13:27:06 -08:00
isicom.c
…
istallion.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
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
SGI Altix IA64 mmtimer: eliminate long interval timer holdoffs
2010-10-27 18:03:14 -07:00
moxa.c
…
moxa.h
…
mspec.c
…
mxser.c
drivers/char/mxser.c: fix compilation warning in mxser.c
2010-10-27 18:03:15 -07:00
mxser.h
…
nozomi.c
nozomi: Fix warning from the previous TIOCGCOUNT changes
2010-11-09 14:49:38 -08:00
nsc_gpio.c
…
nvram.c
…
nwbutton.c
…
nwbutton.h
…
nwflash.c
…
pc8736x_gpio.c
…
ppdev.c
drivers/char/ppdev.c: fix information leak to userland
2010-10-27 18:03:14 -07:00
ps3flash.c
…
ramoops.c
ramoops: fix types, remove typecasts
2011-01-13 08:03:23 -08:00
random.c
random: Use this_cpu_inc_return
2010-12-17 15:18:05 +01:00
raw.c
block: make blkdev_get/put() handle exclusive access
2010-11-13 11:55:17 +01:00
riscom8_reg.h
…
riscom8.c
…
riscom8.h
…
rocket_int.h
…
rocket.c
rocket: fix compiler warning on rocket_pci_ids
2010-12-10 15:20:14 -08:00
rocket.h
…
rtc.c
…
scc.h
…
scx200_gpio.c
…
ser_a2232.c
…
ser_a2232.h
…
ser_a2232fw.ax
…
ser_a2232fw.h
…
serial167.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
snsc_event.c
…
snsc.c
…
snsc.h
headers: kobject.h redux
2011-01-10 08:51:44 -08:00
sonypi.c
sonypi: don't use flush_scheduled_work()
2010-12-24 15:59:07 +01:00
specialix_io8.h
…
specialix.c
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-01-07 14:39:20 -08:00
stallion.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
sx.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
sx.h
…
sxboards.h
…
sxwindow.h
…
synclink_gt.c
drivers/char/synclink_gt.c: add extended sync feature
2010-10-27 18:03:14 -07:00
synclink.c
…
synclinkmp.c
…
tb0219.c
…
tlclk.c
…
toshiba.c
…
ttyprintk.c
…
uv_mmtimer.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
viotape.c
…
vme_scc.c
…