]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/input/keyboard/innovator_ps2.c
Merge source.mvista.com:linux-omap
authorJuha Yrjola <juha.yrjola@nokia.com>
Tue, 18 Apr 2006 17:02:48 +0000 (20:02 +0300)
committerJuha Yrjola <juha.yrjola@nokia.com>
Tue, 18 Apr 2006 17:02:48 +0000 (20:02 +0300)
commit330c1eb9a689973326cdece277d0b4b409833bb9
tree50a89e0e564cf938130fbf6226e392c614174337
parent02f174426cafbba04f6e6737001b1bb04c0cbe97
parent3870564b37989d1fe95cf746a63413403f27792f
Merge source.mvista.com:linux-omap

Conflicts:

arch/arm/mach-omap1/board-nokia770.c
drivers/i2c/chips/tlv320aic23.c
sound/arm/omap-aic23.h
arch/arm/mach-omap1/board-nokia770.c
drivers/i2c/chips/tlv320aic23.c