]> git.proxmox.com Git - mirror_linux-firmware.git/commit - WHENCE
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-firmware
authorDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 1 Nov 2010 14:23:42 +0000 (10:23 -0400)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 1 Nov 2010 14:24:00 +0000 (10:24 -0400)
commitcb6d7df4df6143a9ba6db30261aa7d5bd9d587f3
tree3f7436cd137f4081ad2534fdc3c98d80691ce090
parentaf4d39eaa8f7423a61b6a4fb23a74ee946222463
parent89c6da31513fb1456624df7ef92503de580e073e
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-firmware

Conflicts:
WHENCE
WHENCE