From: Tony Lindgren <tony@atomide.com>
Date: Tue, 9 Aug 2011 10:45:56 +0000 (-0700)
Subject: Merge branch 'linus' into cbus
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf4c3fde6435eb061435d082138ea17289fd6a23;p=pandora-kernel.git

Merge branch 'linus' into cbus

Conflicts:
	Documentation/feature-removal-schedule.txt
	Makefile
	fs/gfs2/glock.c
	scripts/kconfig/confdata.c
---

bf4c3fde6435eb061435d082138ea17289fd6a23
Reading git-diff-tree failed