Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorDavid Vrabel <david.vrabel@csr.com>
Fri, 2 Jan 2009 13:17:13 +0000 (13:17 +0000)
committerDavid Vrabel <david.vrabel@csr.com>
Fri, 2 Jan 2009 13:17:13 +0000 (13:17 +0000)
commitb21a207141d83a06abc5f492b80204602e02ca44
treef0152cde543008c72d7eb5c12c18095ad92785e6
parent3af373021fa32f8f787bfbdcc1a9277a287bde4e
parentb58602a4bac012b5f4fc12fe6b46ab237b610d5d
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into for-upstream

Conflicts:

drivers/uwb/wlp/eda.c
drivers/uwb/wlp/eda.c