From: Grazvydas Ignotas <notasas@gmail.com>
Date: Fri, 7 May 2010 13:52:18 +0000 (+0300)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux... 
X-Git-Tag: Release-2010-05/1~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a6c2f8305acbad93fb5c527abb1872f365caddf;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/stable/linux-2.6.27.y into pandora-27-omap1_rework

Conflicts:
	drivers/usb/musb/davinci.c
	security/Kconfig
---

3a6c2f8305acbad93fb5c527abb1872f365caddf
Reading git-diff-tree failed