projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2176d7 e7ee762)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Sep 2010 20:01:47 +0000 (16:01 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Sep 2010 20:01:47 +0000 (16:01 -0400)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
drivers/net/wireless/iwlwifi/iwl3945-base.c


Trivial merge