From: Tony Lindgren <tony@atomide.com>
Date: Wed, 5 Mar 2008 08:33:15 +0000 (+0200)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.25-omap1~154
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2fbfd6bd4e61fbfc94c95420df63e1b10862a3c;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/rtc/Kconfig
---

e2fbfd6bd4e61fbfc94c95420df63e1b10862a3c
Reading git-diff-tree failed