Public Git Hosting - orinoco

commit	399e1cbd41b110f0b30b68ac0835a3fc053d30bd
author	David Kilroy <kilroyd@googlemail.com>
	Wed, 9 Dec 2009 20:05:14 +0000 (9 20:05 +0000)
committer	David Kilroy <kilroyd@googlemail.com>
	Wed, 9 Dec 2009 20:10:09 +0000 (9 20:10 +0000)
tree	728f66b183daa96edfc4d76a7681efffe880d4ae	tree \| snapshot (tar.gz zip)
parent	bda6e783927eb5415428a77075d651de053657f2	commit \| diff
parent	9988eb0351e991ac7f62120b7cc55e0cb8383834	commit \| diff

Merge branch 'v2.6.30-usb'

Conflicts:
drivers/net/wireless/Kconfig
drivers/net/wireless/orinoco/hermes.c
drivers/net/wireless/orinoco/hermes.h
drivers/net/wireless/orinoco/orinoco.c