From: Tony Lindgren <tony@atomide.com>
Date: Mon, 2 Apr 2007 17:28:24 +0000 (-0400)
Subject: Merge omap-drivers
X-Git-Tag: v2.6.21-omap1~45
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c867c0e9442ae6271db5ec7bb5ee7d88e90af060;p=linux-2.6-omap-h63xx.git

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
---

c867c0e9442ae6271db5ec7bb5ee7d88e90af060