From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 27 Jul 2010 15:59:19 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet... 
X-Git-Tag: v2.6.36-rc1~571^2~64^2~48
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=800f65bba8d2030b3fef62850e203f9f176625a8;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/holtmann/bluetooth-next-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h
---

800f65bba8d2030b3fef62850e203f9f176625a8
Reading git-diff-tree failed