Linus Torvalds 1c496784a0 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 ... * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits) arm: omap: Add omap3_defconfig AM35xx: Defconfig for AM3517 EVM board AM35xx: Add support for AM3517 EVM board omap: 3630sdp: defconfig creation omap: 3630sdp: introduce 3630 sdp board support omap3: Add defconfig for IGEP v2 board omap3: Add minimal IGEP v2 support omap3: Add CompuLab CM-T35 defconfig omap3: Add CompuLab CM-T35 board support omap3: rx51: Add wl1251 wlan driver support omap3: rx51: Add SDRAM init omap1: Add default kernel configuration for Herald omap1: Add board support and LCD for HTC Herald omap: zoom2: update defconfig for LL_DEBUG_NONE omap: zoom3: defconfig creation omap3: zoom: Introduce zoom3 board support omap3: zoom: Drop i2c-1 speed to 2400 omap3: zoom: rename zoom2 name to generic zoom omap3: zoom: split board file for software reuse omap3evm: MIgrate to smsc911x ethernet driver ... Fix trivial conflict (two unrelated config options added next to each other) in arch/arm/mach-omap2/Makefile		2009-12-08 08:15:29 -08:00
..
gameport	Input: serio - do not use deprecated dev.power.power_state	2009-05-09 16:10:18 -07:00
joystick	Input: xpad - add BigBen Interactive XBOX 360 Controller	2009-10-05 22:00:09 -07:00
keyboard	Merge 7xx-iosplit-plat-merge with omap-fixes	2009-11-22 10:08:43 -08:00
misc	Input: winbond-cir - select LEDS_TRIGGERS	2009-11-02 22:12:29 -08:00
mouse	Input: lifebook - fix settings for CF-72	2009-11-16 22:27:12 -08:00
serio	Input: i8042 - add Dell Vostro 1320, 1520 and 1720 to the reset list	2009-12-02 15:41:33 -08:00
tablet	Input: wacom - don't use on-stack memory for report buffers	2009-08-21 00:51:28 -07:00
touchscreen	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2009-10-09 13:32:24 -07:00
apm-power.c
evbug.c	Input: struct device - replace bus_id with dev_name(), dev_set_name()	2008-10-30 09:29:05 -04:00
evdev.c	headers: remove sched.h from poll.h	2009-10-04 15:05:10 -07:00
ff-core.c	Input: fix locking in memoryless force-feedback devices	2009-11-10 21:13:32 -08:00
ff-memless.c	Input: fix locking in memoryless force-feedback devices	2009-11-10 21:13:32 -08:00
fixp-arith.h
input-compat.c	Input: refactor evdev 32bit compat to be shareable with uinput	2008-10-27 22:03:42 -04:00
input-compat.h	Input: refactor evdev 32bit compat to be shareable with uinput	2008-10-27 22:03:42 -04:00
input-polldev.c
input.c	Input: force LED reset on resume	2009-11-12 23:20:35 -08:00
joydev.c	headers: remove sched.h from poll.h	2009-10-04 15:05:10 -07:00
Kconfig	trivial: fix typos/grammar errors in Kconfig texts	2009-03-30 15:22:01 +02:00
Makefile	Input: refactor evdev 32bit compat to be shareable with uinput	2008-10-27 22:03:42 -04:00
mousedev.c	headers: remove sched.h from poll.h	2009-10-04 15:05:10 -07:00
xen-kbdfront.c	xen: remove driver_data direct access of struct device from more drivers	2009-06-15 21:30:28 -07:00