git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffaf960 7fa2d91)
Merge omap-drivers
authorTony Lindgren <tony@atomide.com>
Mon, 2 Apr 2007 17:28:24 +0000 (13:28 -0400)
committerTony Lindgren <tony@atomide.com>
Mon, 2 Apr 2007 17:28:24 +0000 (13:28 -0400)
Conflicts:

drivers/Makefile
drivers/i2c/chips/gpio_expander_omap.c
drivers/i2c/chips/menelaus.c
drivers/i2c/chips/tlv320aic23.c
include/asm-arm/hardware/tsc2101.h
net/ipv4/netfilter/ipt_IDLETIMER.c

nothing to commit


Trivial merge
Pandora Kernel Repository