]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-wireless' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 26 Jun 2012 18:23:41 +0000 (14:23 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 26 Jun 2012 18:23:41 +0000 (14:23 -0400)
commit161ae88744bdcef15058a38f101b06308d8824d4
treef54e83949b47bd6976d57afde9a5ea79801b0395
parenteac9ac6d1f5d0e9d33e4ded682187b630e7606cd
parent03e934f620101ca2cfc9383bd76172dd3e1f8567
Merge branch 'for-wireless' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0