tree 2be39bf8942edca1bcec735145e144a682ca9cd3
parent f0de70f8bb56952f6e016a65a8a8d006918f5bf6
parent 0384e2959127a56d0640505d004d8dd92f9c29f5
author David S. Miller <davem@davemloft.net> 1238106204 -0700
committer David S. Miller <davem@davemloft.net> 1238106204 -0700

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/net/wimax/i2400m/usb-notif.c