![]() * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (50 commits) davinci: fix remaining board support after io_pgoffst removal davinci: mityomapl138: make file local data static arm/davinci: remove duplicated include davinci: Initial support for Omapl138-Hawkboard davinci: MityDSP-L138/MityARM-1808 read MAC address from I2C Prom davinci: add tnetv107x touchscreen platform device input: add driver for tnetv107x touchscreen controller davinci: add keypad config for tnetv107x evm board davinci: add tnetv107x keypad platform device input: add driver for tnetv107x on-chip keypad controller net: davinci_emac: cleanup unused cpdma code net: davinci_emac: switch to new cpdma layer net: davinci_emac: separate out cpdma code net: davinci_emac: cleanup unused mdio emac code omap: cleanup unused davinci mdio arch code davinci: cleanup mdio arch code and switch to phy_id net: davinci_emac: switch to new mdio omap: add mdio platform devices davinci: add mdio platform devices net: davinci_emac: separate out davinci mdio ... Fix up trivial conflict in drivers/input/keyboard/Kconfig (two entries added next to each other - one from the davinci merge, one from the input merge) |
||
---|---|---|
.. | ||
aaed2000_kbd.c | ||
adp5520-keys.c | ||
adp5588-keys.c | ||
amikbd.c | ||
atakbd.c | ||
atkbd.c | ||
bf54x-keys.c | ||
davinci_keyscan.c | ||
ep93xx_keypad.c | ||
gpio_keys.c | ||
hil_kbd.c | ||
hilkbd.c | ||
hpps2atkbd.h | ||
imx_keypad.c | ||
jornada680_kbd.c | ||
jornada720_kbd.c | ||
Kconfig | ||
lkkbd.c | ||
lm8323.c | ||
locomokbd.c | ||
Makefile | ||
maple_keyb.c | ||
matrix_keypad.c | ||
max7359_keypad.c | ||
mcs_touchkey.c | ||
newtonkbd.c | ||
nomadik-ske-keypad.c | ||
omap-keypad.c | ||
omap4-keypad.c | ||
opencores-kbd.c | ||
pxa27x_keypad.c | ||
pxa930_rotary.c | ||
qt2160.c | ||
samsung-keypad.c | ||
sh_keysc.c | ||
stmpe-keypad.c | ||
stowaway.c | ||
sunkbd.c | ||
tca6416-keypad.c | ||
tnetv107x-keypad.c | ||
twl4030_keypad.c | ||
w90p910_keypad.c | ||
xtkbd.c |