From: David Vrabel <david.vrabel@csr.com>
Date: Fri, 2 Jan 2009 13:17:13 +0000 (+0000)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: v2.6.29-rc1~541^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b21a207141d83a06abc5f492b80204602e02ca44;p=linux-2.6-block.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into for-upstream

Conflicts:

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

b21a207141d83a06abc5f492b80204602e02ca44