Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
David Vrabel [Fri, 2 Jan 2009 13:17:13 +0000 (13:17 +0000)]
Conflicts:

drivers/uwb/wlp/eda.c

1  2 
drivers/uwb/wlp/eda.c

Simple merge