Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Mon, 23 Nov 2009 22:01:47 +0000 (14:01 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 23 Nov 2009 22:01:47 +0000 (14:01 -0800)
commitb5b5150977cdfb7173f4468ccd30f9b4a981b902
tree27d477910d630a027c0b447a58ae61b1c57dbca5
parentdcfcb256cc23c4436691b0fe677275306699d6a1
parent45ba564d765d6165330e9bb14a197bdd348c114d
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
net/rfkill/core.c