git.karo-electronics.de Git - karo-tx-linux.git/log

Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
arch/arm/mach-mx5/mm.c
arch/arm/plat-mxc/include/mach/hardware.h

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 23:07:03 +0000 (10:07 +1100)]

Merge remote-tracking branch 'at91/at91-next'

Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/setup.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 23:05:47 +0000 (10:05 +1100)]

Merge remote-tracking branch 'arm-perf/for-next/perf'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 23:04:27 +0000 (10:04 +1100)]

Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/mm/ioremap.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 22:58:37 +0000 (09:58 +1100)]

Merge remote-tracking branch 'arm/for-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 22:55:22 +0000 (09:55 +1100)]

Merge remote-tracking branch 'crypto-current/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 22:55:15 +0000 (09:55 +1100)]

Merge remote-tracking branch 'wireless/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 22:55:13 +0000 (09:55 +1100)]

Merge remote-tracking branch 'pci-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 22:55:12 +0000 (09:55 +1100)]

Merge remote-tracking branch 'sound-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 22:55:12 +0000 (09:55 +1100)]

Merge remote-tracking branch 'net/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 22:55:09 +0000 (09:55 +1100)]

Merge remote-tracking branch 'arm-current/fixes'

commit | commitdiff | tree

Jesper Juhl [Sun, 20 Nov 2011 20:59:55 +0000 (21:59 +0100)]

Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h

"make versioncheck" points out that arch/hexagon/include/asm/spinlock_types.h
does not need to include version.h .
A quick look at the file seems to confirm its findings, so here's a patch that
removes the include.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Linas Vepstas <linasvepstas@gmail.com>
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>

commit | commitdiff | tree

Richard Kuo [Tue, 15 Nov 2011 22:58:11 +0000 (16:58 -0600)]

Hexagon: misc compile warning/error cleanup due to missing headers

Fixed warnings/errors for EXPORT_SYMBOL, linux_binprm, elf related
defines

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>

commit | commitdiff | tree

Richard Kuo [Tue, 15 Nov 2011 22:31:48 +0000 (16:31 -0600)]

various Kconfig cleanup and old platform build code removal

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>

commit | commitdiff | tree

Paul Bolle [Thu, 10 Nov 2011 20:07:47 +0000 (21:07 +0100)]

hexagon: drop selects of bogus Kconfig symbols

There are no Kconfig symbols named GENERIC_HARDIRQS_NO__DO_IRQ and
GENERIC_HARDIRQS_NO_DEPRECATED. The two select statements for these
symbols are nops. Drop these.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>

commit | commitdiff | tree

Thomas Meyer [Tue, 15 Nov 2011 17:37:53 +0000 (11:37 -0600)]

Use resource_size function on resource object instead of explicit computation.

The semantic patch that makes this change is available
in scripts/coccinelle/api/resource_size.cocci.

More information about semantic patching is available at
http://coccinelle.lip6.fr/

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>

commit | commitdiff | tree

Paul Bolle [Tue, 22 Nov 2011 12:07:02 +0000 (13:07 +0100)]

sound: Kconfig: drop unknown symbol ARCH_CLPS7500

Commit 635f0258e5 ("[ARM] clps7500: remove support") missed one instance
of the ARCH_CLPS7500 Kconfig symbol. Drop it now.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit | commitdiff | tree

Jiri Kosina [Tue, 22 Nov 2011 22:26:06 +0000 (23:26 +0100)]

Merge branch 'upstream' into for-next

commit | commitdiff | tree

Jiri Kosina [Tue, 22 Nov 2011 22:25:28 +0000 (23:25 +0100)]

HID: picolcd: make fb_pending_lock and picolcd_fb_cleanup static

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit | commitdiff | tree

Jiri Kosina [Tue, 22 Nov 2011 22:23:37 +0000 (23:23 +0100)]

HID: multitouch: make struct mt_classess static

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit | commitdiff | tree

Srivatsa S. Bhat [Tue, 22 Nov 2011 22:20:31 +0000 (23:20 +0100)]

PM / Hibernate: Refactor and simplify hibernation_snapshot() code

The goto statements in hibernation_snapshot() are a bit complex.
Refactor the code to remove some of them, thereby simplifying the
implementation.

Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

commit | commitdiff | tree

Jiri Kosina [Tue, 22 Nov 2011 22:19:06 +0000 (23:19 +0100)]

Merge branch 'wiimote' into for-next

commit | commitdiff | tree

David Herrmann [Thu, 17 Nov 2011 13:12:14 +0000 (14:12 +0100)]

HID: wiimote: Enable NO_INIT_REPORTS quirk

Newer bluetooth stack supports the NO_INIT_REPORTS quirk. The wiimote does not
support report initialization so enable it by default.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit | commitdiff | tree

David Herrmann [Thu, 17 Nov 2011 13:12:13 +0000 (14:12 +0100)]

HID: wiimote: Remove module version number

The version number is not needed at all for in-tree drivers. Upstream git is
used to track module versions.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit | commitdiff | tree

David Herrmann [Thu, 17 Nov 2011 13:12:12 +0000 (14:12 +0100)]

HID: wiimote: Allow direct DRM debug access

Keep track of current drm and add new debugfs file which reads or writes the
current DRM.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit | commitdiff | tree

David Herrmann [Thu, 17 Nov 2011 13:12:11 +0000 (14:12 +0100)]

HID: wiimote: Allow direct eeprom access

The wiimote provides direct access to parts of its eeprom. This implements read
support for small chunks of the eeprom. This isn't very fast but prevents the
reader from blocking the wiimote stream for too long.

Write support is not yet supported as the wiimote breaks if we overwrite its
memory. Use hidraw to reverse-engineer the eeprom before implementing write
support here.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit | commitdiff | tree

David Herrmann [Thu, 17 Nov 2011 13:12:10 +0000 (14:12 +0100)]

HID: wiimote: Add debugfs support stubs

Add initializer and deinitializer for debugfs support. This will later allow raw
eeprom access and direct DRM modifications to debug wiimote behaviour and
further protocol reverse-engineerings.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Linux kernel for KaRo TX COM modules

RSS Atom