]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/media/video/gspca/konica.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 18 Nov 2010 19:56:09 +0000 (11:56 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 Nov 2010 19:56:09 +0000 (11:56 -0800)
commit07bfa524d4c67acbb6b6fbdd1dea923d07853c04
tree6e3819f13d3f4efa9c099cf227b1d42b1bc78620
parent93908d192686d8285dd6441ff855df92a40103d2
parent3bf30b56c4f0a1c4fae34050b7db4527c92891e8
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6