]> spindle.queued.net Git - linux-firmware/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/gregkh/firmware
authorDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 7 Apr 2010 16:46:02 +0000 (17:46 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 7 Apr 2010 16:46:38 +0000 (17:46 +0100)
commit726025e8df38178ceb1f7b6a70699795cf75e368
treebdb46ee35996d8cd0b69fe33b578b14f514f0b25
parent8c3ff02adff5f8d492535ae78bf294b5c06baeac
parenta9799c6dbb173b98215fad9abb3eb6f4d47a188c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/gregkh/firmware

Conflicts:
WHENCE
WHENCE