Merge git://git.infradead.org/users/dwmw2/spectra-2.6 into work
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Jun 2010 19:13:11 +0000 (12:13 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Jun 2010 19:13:11 +0000 (12:13 -0700)
commit178f16db8f24b87fc5f3d16f426ed41c397b96a9
treec0d7639a638da75ea85f1fa2523f2965f1116776
parent013a468c4504738856d67118492ce7b7fff53a48
parentbf46b9a92e45044d0b41beed61ae118e560dd3e4
Merge git://git.infradead.org/users/dwmw2/spectra-2.6 into work
drivers/staging/Kconfig
drivers/staging/Makefile