]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d68a31c 263dcc5)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Nov 2012 15:56:03 +0000 (10:56 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Nov 2012 15:56:03 +0000 (10:56 -0500)
commit9518afb7d8c039051a26f5831c39a57ca5229ca3
tree859c8071aab68fd32f36ffb9ebc04cf12db6e5e0tree | snapshot
parentd68a31cb8206fb65d92db8d32a27fe42681e90bdcommit | diff
parent263dcc5f5e39b45eb616f86a89d388d3e822fe38commit | diff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c
MAINTAINERS diff1 | diff2 | blob | history
Linux Kernel Source Tree.