OSDN Git Service
Mike Thomas [Sun, 7 Nov 2010 20:00:35 +0000 (20:00 +0000)]
staging/easycap: Improve hardware initialization
Sometimes at startup the video urbs consistently and persistently deliver
bad data, each video frame (not isoc frame) containing an excess of
precisely two bytes. A brute-force cure implemented here is to
repeatedly reinitialize the registers of the SAA7113H chip and the
STK1160 USB bridge until good behaviour is obtained.
Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike Thomas [Sun, 7 Nov 2010 19:58:55 +0000 (19:58 +0000)]
staging/easycap: Make code re-entrant
In order to allow multiple EasyCAP dongles to operate simultaneously
without mutual interference all static variables have been eliminated
except for a persistent inventory of plugged-in dongles at module level.
Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike Thomas [Sun, 7 Nov 2010 19:56:40 +0000 (19:56 +0000)]
staging/easycap: Remove obsolete routines
The so-called bridger routine has proved unnecessary following general
improvements elsewhere. The explain_() functions were a convenience
during early development, but are unnecessary and inappropriate now.
Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 10 Nov 2010 00:12:37 +0000 (16:12 -0800)]
Staging: Merge Ben Collins solo6x10 tree with upstream
There were some duplicate changes that needed to be hand-merged due to
fixes needed to keep .37 building and working properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Thu, 4 Nov 2010 21:27:42 +0000 (22:27 +0100)]
pohmelfs: remove unneeded conditionals before calls to crypto_destroy_tfm wrappers.
Hi,
crypto_free_hash() and crypto_free_ablkcipher() are just wrappers around
crypto_free_tfm() which is itself just a wrapper around
crypto_destroy_tfm().
Passing crypto_destroy_tfm() a NULL pointer is valid, so there's no reason
to check for NULL first.
Removing the unneeded conditionals (which is what the patch does) brings
us the benefit of having to execute a few fewer test/branch instructions
and also reduces object code size slightly:
before:
text data bss dec hex filename
8630 112 3312 12054 2f16 drivers/staging/pohmelfs/crypto.o
0000000000000cbe <pohmelfs_crypto_engine_exit>:
cbe: 55 push %rbp
cbf: 48 89 e5 mov %rsp,%rbp
cc2: 53 push %rbx
cc3: 48 83 ec 08 sub $0x8,%rsp
cc7: e8 00 00 00 00 callq ccc <pohmelfs_crypto_engine_exit+0xe>
ccc: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cd3 <pohmelfs_crypto_engine_exit+0x15>
cd3: 48 89 fb mov %rdi,%rbx
cd6: 48 8b 7f 20 mov 0x20(%rdi),%rdi
cda: 48 85 ff test %rdi,%rdi
cdd: 74 0c je ceb <pohmelfs_crypto_engine_exit+0x2d>
cdf: 48 ff 05 00 00 00 00 incq 0x0(%rip) # ce6 <pohmelfs_crypto_engine_exit+0x28>
ce6: e8 58 fa ff ff callq 743 <crypto_free_hash>
ceb: 48 8b 7b 28 mov 0x28(%rbx),%rdi
cef: 48 85 ff test %rdi,%rdi
cf2: 75 09 jne cfd <pohmelfs_crypto_engine_exit+0x3f>
cf4: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cfb <pohmelfs_crypto_engine_exit+0x3d>
cfb: eb 16 jmp d13 <pohmelfs_crypto_engine_exit+0x55>
cfd: 48 89 fe mov %rdi,%rsi
d00: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d07 <pohmelfs_crypto_engine_exit+0x49>
d07: e8 00 00 00 00 callq d0c <pohmelfs_crypto_engine_exit+0x4e>
d0c: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d13 <pohmelfs_crypto_engine_exit+0x55>
d13: 48 8b 7b 18 mov 0x18(%rbx),%rdi
d17: e8 00 00 00 00 callq d1c <pohmelfs_crypto_engine_exit+0x5e>
d1c: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d23 <pohmelfs_crypto_engine_exit+0x65>
d23: 5e pop %rsi
d24: 5b pop %rbx
d25: c9 leaveq
d26: c3 retq
after:
text data bss dec hex filename
8604 112 3296 12012 2eec drivers/staging/pohmelfs/crypto.o
0000000000000cbe <pohmelfs_crypto_engine_exit>:
cbe: 55 push %rbp
cbf: 48 89 e5 mov %rsp,%rbp
cc2: 53 push %rbx
cc3: 48 83 ec 08 sub $0x8,%rsp
cc7: e8 00 00 00 00 callq ccc <pohmelfs_crypto_engine_exit+0xe>
ccc: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cd3 <pohmelfs_crypto_engine_exit+0x15>
cd3: 48 89 fb mov %rdi,%rbx
cd6: 48 8b 7f 20 mov 0x20(%rdi),%rdi
cda: e8 64 fa ff ff callq 743 <crypto_free_hash>
cdf: 48 8b 7b 28 mov 0x28(%rbx),%rdi
ce3: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cea <pohmelfs_crypto_engine_exit+0x2c>
cea: 48 89 fe mov %rdi,%rsi
ced: e8 00 00 00 00 callq cf2 <pohmelfs_crypto_engine_exit+0x34>
cf2: 48 8b 7b 18 mov 0x18(%rbx),%rdi
cf6: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cfd <pohmelfs_crypto_engine_exit+0x3f>
cfd: e8 00 00 00 00 callq d02 <pohmelfs_crypto_engine_exit+0x44>
d02: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d09 <pohmelfs_crypto_engine_exit+0x4b>
d09: 5e pop %rsi
d0a: 5b pop %rbx
d0b: c9 leaveq
d0c: c3 retq
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tobias Klauser [Wed, 3 Nov 2010 09:59:02 +0000 (10:59 +0100)]
staging: batman-adv: Use linux/etherdevice.h address helper functions
Replace custom ethernet address check functions by calls to the helpers
in linux/etherdevice.h
In one case where the address was tested for broadcast and multicast
address, the broadcast address check can be omitted as broadcast is also
a multicast address.
The patch is only compile-tested.
Cc: Marek Lindner <lindner_marek@yahoo.de>
Cc: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Wed, 3 Nov 2010 10:19:55 +0000 (11:19 +0100)]
staging: ft1000: Get rid of UINT typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Wed, 3 Nov 2010 10:19:54 +0000 (11:19 +0100)]
staging: ft1000: Get rid of PCHAR typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 4 Nov 2010 06:37:13 +0000 (07:37 +0100)]
staging: ft1000: Get rid of BOOLEAN typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Wed, 3 Nov 2010 10:19:52 +0000 (11:19 +0100)]
staging: ft1000: Get rid of ULONG typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Wed, 3 Nov 2010 10:19:51 +0000 (11:19 +0100)]
staging: ft1000: Get rid of PULONG typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Wed, 3 Nov 2010 10:19:50 +0000 (11:19 +0100)]
staging: ft1000: Get rid of USHORT typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Wed, 3 Nov 2010 10:19:49 +0000 (11:19 +0100)]
staging: ft1000: GEt rid of PUSHORT typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Wed, 3 Nov 2010 10:19:48 +0000 (11:19 +0100)]
staging: ft1000: Get rid of UCHAR typedef.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Wed, 3 Nov 2010 10:19:47 +0000 (11:19 +0100)]
staging: ft1000: Get rid of PUCHAR typedef.
PUCHAR typedef was replaces by u8 *.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Tue, 2 Nov 2010 13:51:47 +0000 (14:51 +0100)]
staging: ft1000: Check return value.
Function ft1000_submit_rx_urb() could fail so add checking
for return value.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Tue, 2 Nov 2010 13:51:46 +0000 (14:51 +0100)]
staging: ft1000: Correct return error values.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Tue, 2 Nov 2010 13:51:45 +0000 (14:51 +0100)]
staging: ft1000: Use common return point.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Tue, 2 Nov 2010 13:51:44 +0000 (14:51 +0100)]
staging: ft1000: Use specific error codes instead self defined.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Tue, 2 Nov 2010 12:44:10 +0000 (13:44 +0100)]
staging: ft1000: Pseudo header handlig improved.
Handling for pseudo header was done by directly copying
data to tx buffer. This hide a functionality and make
code unreadable.
Use approach where fill pseudo_hdr structure first with data and then copy
to beginning of buffer.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Tue, 2 Nov 2010 12:44:09 +0000 (13:44 +0100)]
staging: ft1000: Remove dead code.
Remove functions which was used nowhere. Also remove dead
variables used by this functions.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Tue, 2 Nov 2010 12:44:08 +0000 (13:44 +0100)]
staging: ft1000: Use memset instead looping with for.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Mon, 1 Nov 2010 20:29:31 +0000 (22:29 +0200)]
Staging: w35und: Kill struct hwdata ->SurpriseRemoveCount
This patch kills the ->SurpriseRemoveCount member of struct hwdata. It's not
used at all so it's safe to remove it.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Mon, 1 Nov 2010 20:29:30 +0000 (22:29 +0200)]
Staging: w35und: Kill struct hwdata ->HwStop
This patch kills the ->HwStop member of struct hwdata. It's a read-only
variable that's always zero so it's safe to remove it.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Mon, 1 Nov 2010 20:29:29 +0000 (22:29 +0200)]
Staging: w35und: Kill struct hwdata ->NullPacketCount
This patch kills the NullPacketCount member of struct hwdata. It's not used for
anything so it's safe to remove it.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Mon, 1 Nov 2010 20:29:28 +0000 (22:29 +0200)]
Staging: w35und: Kill empty Mds_Destroy function
The Mds_Destroy() function doesn't do anything so kill it.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mauro Schilman [Mon, 1 Nov 2010 17:12:05 +0000 (14:12 -0300)]
Staging: frontier: fix space and * coding style issues in alphatrack.c
This is a patch to the alphatrack.c file that fixes up a space warning
and a space after '*' warning found by the checkpatch.pl tool
Signed-off-by: Mauro Schilman <maurito.s@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Mon, 1 Nov 2010 19:50:06 +0000 (21:50 +0200)]
Staging: w35und: Rename wbhal_s.h to wbhal.h
This patch renames the wbhal_s.h header file to wbhal.h now that it contains
both structure and function definitions.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Mon, 1 Nov 2010 19:50:05 +0000 (21:50 +0200)]
Staging: w35und: Merge wbhal_f.h to wbhal_s.h
This patch merges HAL struct and function definitions into one header file.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Felipe Andres Besoain Pino [Fri, 29 Oct 2010 22:15:58 +0000 (19:15 -0300)]
staging: vt6656: resolved checkpatch finding
removed spaces at the start of a lines.
Signed-off-by: Felipe Andres Besoain Pino <fbesoain@gnome.cl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ariel Savini [Fri, 29 Oct 2010 22:19:20 +0000 (19:19 -0300)]
staging: vt6656 resolved parenthesis not spaces
removes before parenthesis
Signed-off-by: Ariel Savini <arielsavini@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mariano Reingart [Fri, 29 Oct 2010 22:15:26 +0000 (19:15 -0300)]
staging: vt6656: resolved checkpatch finding
removed a C99 '//' comment and added a space around '='
Signed-off-by: Mariano Reingart <reingart@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Matias De la Puente [Fri, 29 Oct 2010 22:07:45 +0000 (19:07 -0300)]
staging: vt6656: resolved checkpatch finding
removed parentesis and spaces at the start of a line of a return
Signed-off-by: Matias De la Puente <mfpuente.ar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Sat, 30 Oct 2010 21:08:38 +0000 (14:08 -0700)]
Staging: solo6x10: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Eric Dumazet [Fri, 29 Oct 2010 13:19:27 +0000 (15:19 +0200)]
staging: get rid of dev_base_lock
dev_base_lock was the legacy rwlock used to protect netdevice list, and
is expected to vanish.
We now use RTNL and RCU locking.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:22 +0000 (21:44 -0400)]
staging: iio: adis16209: tuning spi delay to make hardware more stable
Looks like one spot was missed in the previous spi tune patch.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Graf Yang [Thu, 28 Oct 2010 01:44:21 +0000 (21:44 -0400)]
staging: iio: resolver: new driver for AD2S1210 devices
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Graf Yang [Thu, 28 Oct 2010 01:44:20 +0000 (21:44 -0400)]
staging: iio: resolver: new driver for AD2S1200/1205 devices
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Graf Yang [Thu, 28 Oct 2010 01:44:19 +0000 (21:44 -0400)]
staging: iio: resolver: new driver for AD2S90 devices
This also kicks off the new resolver subsection.
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:18 +0000 (21:44 -0400)]
staging: iio: meter: new driver for
ADE7854/58/68/78 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:17 +0000 (21:44 -0400)]
staging: iio: meter: new driver for
ADE7759 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:16 +0000 (21:44 -0400)]
staging: iio: meter: new driver for
ADE7758 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:15 +0000 (21:44 -0400)]
staging: iio: meter: new driver for
ADE7754 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:14 +0000 (21:44 -0400)]
staging: iio: meter: new driver for
ADE7753/6 devices
This also kicks off the new meter subsection.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cliff Cai [Thu, 28 Oct 2010 01:44:13 +0000 (21:44 -0400)]
staging: iio: dds: new driver for AD9951 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cliff Cai [Thu, 28 Oct 2010 01:44:12 +0000 (21:44 -0400)]
staging: iio: dds: new driver for AD9910 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cliff Cai [Thu, 28 Oct 2010 01:44:11 +0000 (21:44 -0400)]
staging: iio: dds: new driver for AD9852/4 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cliff Cai [Thu, 28 Oct 2010 01:44:10 +0000 (21:44 -0400)]
staging: iio: dds: new driver for AD9850/1 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cliff Cai [Thu, 28 Oct 2010 01:44:09 +0000 (21:44 -0400)]
staging: iio: dds: new driver for AD9832/3/4/5 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cliff Cai [Thu, 28 Oct 2010 01:44:08 +0000 (21:44 -0400)]
staging: iio: dds: new driver for AD5930/2 devices
This is the initial driver in the new Direct Digital Synthesis section.
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:07 +0000 (21:44 -0400)]
staging: iio: dac: new driver for AD5624R devices
This is used to convert digital streams into voltages.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:06 +0000 (21:44 -0400)]
staging: iio: gyro: new driver for ADIS16130 digital output gyros
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:05 +0000 (21:44 -0400)]
staging: iio: gyro: new driver for ADIS16080 digital output gyros
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:04 +0000 (21:44 -0400)]
staging: iio: gyro: new driver for ADIS16060 digital output gyros
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:03 +0000 (21:44 -0400)]
staging: iio: gyro: new driver for ADIS16251 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:44:02 +0000 (21:44 -0400)]
staging: iio: adc: new driver for ADT7410 temperature sensors
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:44:01 +0000 (21:44 -0400)]
staging: iio: adc: new driver for ADT7310 temperature sensors
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:44:00 +0000 (21:44 -0400)]
staging: iio: adc: new driver for ADT75 temperature sensors
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:43:59 +0000 (21:43 -0400)]
staging: iio: adc: new driver for AD7816 devices
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:43:58 +0000 (21:43 -0400)]
staging: iio: adc: new driver for AD7745/6/7 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:43:57 +0000 (21:43 -0400)]
staging: iio: adc: new driver for AD7314 devices
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:43:56 +0000 (21:43 -0400)]
staging: iio: adc: new driver for AD7298 devices
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:43:55 +0000 (21:43 -0400)]
staging: iio: adc: new driver for AD7291 devices
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:43:54 +0000 (21:43 -0400)]
staging: iio: adc: new driver for AD7152/3 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:43:53 +0000 (21:43 -0400)]
staging: iio: adc: new driver for AD7150/1/6 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:43:52 +0000 (21:43 -0400)]
staging: iio: new ADT7316/7/8 and ADT7516/7/9 driver
IIO driver for temperature sensor, ADC and DAC devices over SPI and I2C.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:43:51 +0000 (21:43 -0400)]
staging: iio: new adis16204 driver
IIO driver for Programmable High-g Digital Impact Sensor and Recorder.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:43:50 +0000 (21:43 -0400)]
staging: iio: new adis16203 driver
IIO driver for Programmable 360 Degrees Inclinometer adis16203 parts.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:43:49 +0000 (21:43 -0400)]
staging: iio: new adis16201 driver
IIO driver for dual Axis Accelerometer/inclinometer adis16201 parts.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike Frysinger [Thu, 28 Oct 2010 01:43:48 +0000 (21:43 -0400)]
staging: iio: add ADI info to TODO
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Michael Hennerich [Thu, 28 Oct 2010 01:43:47 +0000 (21:43 -0400)]
staging: iio: gyro: make sure grep can find the ADIS16265 support
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike Frysinger [Thu, 28 Oct 2010 01:43:46 +0000 (21:43 -0400)]
staging: iio: adis16350: add missing reference to temp offset
We declare this attr but never link it in to the attr list.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Mon, 8 Nov 2010 23:10:02 +0000 (00:10 +0100)]
Staging: brcm80211: Remove unnecessary casts of void ptr returning alloc function return values
The [vk][cmz]alloc(_node) family of functions return void pointers which
it's completely unnecessary/pointless to cast to other pointer types since
that happens implicitly.
This patch removes such casts from drivers/staging/brcm80211/
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Cc: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ben Hutchings [Sun, 7 Nov 2010 17:20:37 +0000 (17:20 +0000)]
Staging: brcmfmac: Fix MAC header lookup on 64-bit architectures
Fix direct use of sk_buff::mac_header which is an offset rather
than a pointer on 64-bit architectures.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Sat, 6 Nov 2010 02:20:16 +0000 (19:20 -0700)]
staging: brcm80211: migrate #includes from headers into .c files.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Thu, 4 Nov 2010 02:53:59 +0000 (19:53 -0700)]
staging: brcm80211: Remove pkttag from osl
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Thu, 4 Nov 2010 02:53:58 +0000 (19:53 -0700)]
staging: brcm80211: Remove 'failed' field from osh
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Nicolas Kaiser [Fri, 29 Oct 2010 22:10:29 +0000 (00:10 +0200)]
Staging: brcm80211: simplify expression
Simplify: ((a && b) || !a) => (b || !a)
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Cc: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 2 Nov 2010 00:10:18 +0000 (17:10 -0700)]
staging: brcm80211: Remove cruft from wlioctl.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 2 Nov 2010 00:10:17 +0000 (17:10 -0700)]
staging: brcm80211: Remove OSL_ERROR entry point
Get rid of generic OSL_ERROR and error code
translation to the only place that needs it: dhd.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 2 Nov 2010 00:10:16 +0000 (17:10 -0700)]
staging: brcm80211: Remove dead code from osl.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 2 Nov 2010 00:10:15 +0000 (17:10 -0700)]
staging: brcm80211: Remove abstraction layer for dma alignment
Directly align buffers instead of abstracting it.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Wed, 27 Oct 2010 22:47:53 +0000 (15:47 -0700)]
staging: brcm80211: purge epivers.h
Purge include/epivers.h moving individual lines to where
they are needed and delete unused refs.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Wed, 27 Oct 2010 01:37:24 +0000 (18:37 -0700)]
staging: brcm80211: Separate fullmac vs softmac defs in shared file
wlioctl.h is shared by fullmac and softmac but mostly fullmac. Separate out
fullmac to purge extranous code in softmac and possibly as a step towards it own file.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 26 Oct 2010 22:23:09 +0000 (15:23 -0700)]
staging: brcm80211: Move #include from bcmutils.h out to .c files
Part of effort to move #includes out of .h files and unwind the include mess.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 26 Oct 2010 18:55:23 +0000 (11:55 -0700)]
staging: brcm80211: Purge linuxver.h and redistribute #includes as required
Linuxver.h only included other .h files. Delete it and move #includes to .c's as needed.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 26 Oct 2010 16:17:06 +0000 (09:17 -0700)]
staging: brcm80211: Move #includes out of d11.h
Move #includes out of d11.h and into .c files
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 26 Oct 2010 16:17:05 +0000 (09:17 -0700)]
staging: brcm80211: Purge unused includes from d11.h
Purge unused #includes from d11.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 26 Oct 2010 16:17:04 +0000 (09:17 -0700)]
staging: brcm80211: Purge unused lines from bcmdefs.h/wlc_pub.h
Purge unused lines
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sven Eckelmann [Mon, 25 Oct 2010 21:43:14 +0000 (23:43 +0200)]
Staging: batman-adv: Remove useless braces
77099f0afe94928b5b0066a7efa5fa9f81696b54 added changes to vis.c which
trigger a checkpatch.pl warning about braces which are not necessary
anymore.
WARNING: braces {} are not necessary for any arm of this statement
+ if (entry->primary)
[...]
+ else {
[...]
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Marek Lindner <lindner_marek@yahoo.de>
Cc: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Naveen Kumar Gaddipati [Tue, 2 Nov 2010 12:08:45 +0000 (17:38 +0530)]
Staging: add Synaptics RMI4 touchpad driver support
Added the Synaptics RMI4 touchpad driver support.
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Christopher Heiny <cheiny@synaptics.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ramesh Agarwal [Fri, 22 Oct 2010 13:00:20 +0000 (14:00 +0100)]
Staging: add Synaptics TM1217 Touchscreen Controller driver
This is submitted as a staging driver because there is a more generic driver
"on the way" for all these devices and has been for some time. The intent is
that as soon as the general drivers are in the mainstream this one will get
any leftovers integrated and then be dumped. Until this unspecified future
data at least people can actually use their hardware.
As its interface is simply input layer we can do that without pain.
Some clean up by Alan Cox
- Extract gpio support and IRQ support more sanely
- Tidying
Signed-off-by: Ramesh Agarwal <ramesh.agarwal@intel.com>
[avoid deference NULL ts if kzalloc fails]
[finger_touched may be used uninitialized]
[fix missing sync which confused twm]
Signed-off-by: Hong Liu <hong.liu@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Atul Sowani [Wed, 3 Nov 2010 13:10:56 +0000 (18:40 +0530)]
Staging: xgifb: change obsolete pci_find_device() with pci_get_device()
Replaced obsolete pci_find_device() calls with pci_get_device() calls.
This is recommended in pci.txt filei in PCI Documentation.
Signed-off-by: Atul Sowani <sowani@gmail.com>
Acked-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Uwe Kleine-König [Tue, 26 Oct 2010 19:57:53 +0000 (21:57 +0200)]
Staging: trivial: fix typos concerning "controller"
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Uwe Kleine-König [Tue, 26 Oct 2010 19:57:52 +0000 (21:57 +0200)]
Staging: trivial: fix typos concerning "configure"
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tracey Dent [Fri, 22 Oct 2010 21:30:28 +0000 (17:30 -0400)]
Staging: msm: Makefile: replace the use of <module>-objs with <module>-y
Changed <module>-objs to <module>-y in Makefile.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Thu, 21 Oct 2010 01:51:06 +0000 (18:51 -0700)]
Staging: intel_sst: Use pr_fmt, fix misspellings
Remove leading "sst: " from format strings.
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Prefix is changed from "sst: " to "snd_intel_sst: "
Add missing newlines
Trim trailing spaces after newlines
Fix several different misspellings
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Tue, 9 Nov 2010 21:43:45 +0000 (13:43 -0800)]
Merge git://git./linux/kernel/git/shemminger/beceem into work-next
Linus Torvalds [Mon, 8 Nov 2010 19:54:53 +0000 (11:54 -0800)]
Merge branch 'for_linus' of git://git./linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: Add new ext4 inode tracepoints
ext4: Don't call sb_issue_discard() in ext4_free_blocks()
ext4: do not try to grab the s_umount semaphore in ext4_quota_off
ext4: fix potential race when freeing ext4_io_page structures
ext4: handle writeback of inodes which are being freed
ext4: initialize the percpu counters before replaying the journal
ext4: "ret" may be used uninitialized in ext4_lazyinit_thread()
ext4: fix lazyinit hang after removing request
Linus Torvalds [Mon, 8 Nov 2010 18:55:29 +0000 (10:55 -0800)]
Merge git://git./linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
TTY: move .gitignore from drivers/char/ to drivers/tty/vt/
TTY: create drivers/tty/vt and move the vt code there
TTY: create drivers/tty and move the tty core files there