]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitca0c4666f7246875af47819d6750a277a9ca99ed
treef0152cde543008c72d7eb5c12c18095ad92785e6
parent6685bdbedf49cda219359c63146bc78042b1c2a1
parente3fd2468a06395fac246f8475f911cc60ef6ccc9
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

Conflicts:

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