From: Tony Lindgren <tony@atomide.com>
Date: Sun, 16 Aug 2009 15:56:38 +0000 (+0300)
Subject: Merge branch 'omap_fixes_31' of git://git.pwsan.com/linux-2.6
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~8^2^2~7^2~34
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=522be011fbffbb6eb20082fec483f38b21cb2319;p=pandora-kernel.git

Merge branch 'omap_fixes_31' of git://git.pwsan.com/linux-2.6

Conflicts:
	arch/arm/mach-omap2/mux.c
	arch/arm/plat-omap/include/mach/mux.h
---

522be011fbffbb6eb20082fec483f38b21cb2319
Reading git-diff-tree failed