]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
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)
commitc867c0e9442ae6271db5ec7bb5ee7d88e90af060
tree469c66b0d3c5a123f39b5110ab023d86656ec131
parentffaf960c7ae3e1433c05a9eb44017a77f7766723
parent7fa2d91390f48f76b5b87fe2f49b677974ed7c38
Merge omap-drivers

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