Merge branch 'master' of git://kernel.ubuntu.com/rtg/compat-wireless-2.6
authorLuis R. Rodriguez <lrodriguez@atheros.com>
Mon, 3 Nov 2008 17:52:41 +0000 (09:52 -0800)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Mon, 3 Nov 2008 17:52:41 +0000 (09:52 -0800)
1  2 
config.mk

diff --cc config.mk
Simple merge