From: David S. Miller <davem@davemloft.net>
Date: Thu, 14 Jul 2011 14:56:40 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.1-rc1~316^2~163
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f;p=pandora-kernel.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	net/bluetooth/l2cap_core.c
---

6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f
Reading git-diff-tree failed