tree 74f915531710303397d34069b325c2be7a5ac93c
parent 30be52e44fd4276d768efffb55d424fb682e6505
parent cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37
author John W. Linville <linville@tuxdriver.com> 1321988746 -0500
committer John W. Linville <linville@tuxdriver.com> 1321988746 -0500

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Conflicts:
	drivers/net/wireless/iwlegacy/iwl-debugfs.c
	drivers/net/wireless/iwlegacy/iwl-rx.c
	drivers/net/wireless/iwlegacy/iwl-scan.c
	drivers/net/wireless/iwlegacy/iwl-tx.c
	include/net/bluetooth/bluetooth.h