git.stricted.de - GitHub/mt8127/android_kernel_alcatel

author	John W. Linville <linville@tuxdriver.com>
	Mon, 21 Jan 2008 18:41:18 +0000 (13:41 -0500)
committer	David S. Miller <davem@davemloft.net>
	Mon, 28 Jan 2008 23:08:45 +0000 (15:08 -0800)
commit	c0ddd04d55e0a4d1506b6b8a4eb9e2b62f3aa41d
tree	c2ef87cc24fd7063c70d1979e127774e49e3ee56	tree \| snapshot (tar.gz zip)
parent	1e637c74b0f84eaca02b914c0b8c6f67276e9697	commit \| diff

wireless: cleanup some merge errors

Signed-off-by: John W. Linville <linville@tuxdriver.com>

drivers/net/wireless/b43/xmit.c		diff \| blob \| blame \| history
drivers/net/wireless/b43legacy/xmit.c		diff \| blob \| blame \| history

kernel source for telekom puls (alcatel/mediatek)