From: Tony Lindgren <tony@atomide.com>
Date: Mon, 17 Nov 2008 18:19:19 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.28-omap1~141
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e88af5fb139aa77131ebbc730a952e019c8f93c1;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/w1/masters/omap_hdq.c
	drivers/w1/slaves/Kconfig
	drivers/w1/slaves/w1_bq27000.c
---

e88af5fb139aa77131ebbc730a952e019c8f93c1