Greg Kroah-Hartman f227e08b71 Merge 2.6.38-rc6 into tty-next ...

This was to resolve a merge issue with drivers/char/Makefile and
drivers/tty/serial/68328serial.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2011-02-24 11:36:31 -08:00

..

agp

agp: ensure GART has an address before enabling it

2011-02-04 09:43:57 +10: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

ipmi

char/ipmi: fix OOPS caused by pnp_unregister_driver on unregistered driver

2011-02-10 18:00:21 -08:00

mwave

drivers/char/mwave/Makefile: clean up

2010-10-27 18:03:15 -07:00

pcmcia

tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/

2011-02-22 16:23:22 -08:00

tpm

Revert "tpm_tis: Use timeouts returned from TPM"

2011-02-20 10:03:12 -08:00

xilinx_hwicap

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

apm-emulation.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

applicom.c

drivers/char/applicom.c: fix information leak to userland

2010-10-27 18:03:14 -07:00

applicom.h

…

bfin-otp.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

briq_panel.c

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

bsr.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

cd1865.h

…

digi1.h

…

digiFep1.h

…

digiPCI.h

…

ds1302.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

ds1620.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

dsp56k.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

dtlk.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

efirtc.c

…

generic_nvram.c

drivers: autoconvert trivial BKL users to private mutex

2010-10-05 15:01:04 +02:00

genrtc.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

hangcheck-timer.c

Input: sysrq - drop tty argument form handle_sysrq()

2010-08-21 00:34:45 -07:00

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

Kconfig

tty: move obsolete and broken generic_serial drivers to drivers/staging/generic_serial/

2011-02-22 17:09:33 -08:00

lp.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

Makefile

Merge 2.6.38-rc6 into tty-next

2011-02-24 11:36:31 -08:00

mbcs.c

drivers: autoconvert trivial BKL users to private mutex

2010-10-05 15:01:04 +02:00

mbcs.h

…

mem.c

vfs: introduce FMODE_UNSIGNED_OFFSET for allowing negative f_pos

2010-10-25 21:18:21 -04:00

misc.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

mmtimer.c

SGI Altix IA64 mmtimer: eliminate long interval timer holdoffs

2010-10-27 18:03:14 -07:00

mspec.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

nsc_gpio.c

…

nvram.c

drivers: autoconvert trivial BKL users to private mutex

2010-10-05 15:01:04 +02:00

nwbutton.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

nwbutton.h

…

nwflash.c

drivers: autoconvert trivial BKL users to private mutex

2010-10-05 15:01:04 +02:00

pc8736x_gpio.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

ppdev.c

drivers/char/ppdev.c: fix information leak to userland

2010-10-27 18:03:14 -07:00

ps3flash.c

drop unused dentry argument to ->fsync

2010-05-27 22:05:02 -04:00

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

rtc.c

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00

scc.h

…

scx200_gpio.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02: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

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

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

tb0219.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

tlclk.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

toshiba.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

ttyprintk.c

tty: now phase out the ioctl file pointer for good

2011-02-17 11:59:56 -08:00

uv_mmtimer.c

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

viotape.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

virtio_console.c

Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-02-10 12:19:58 -08:00