git.proxmox.com Git - mirror_linux-firmware.git/commit

]> git.proxmox.com Git - mirror_linux-firmware.git/commit

author	David Woodhouse <David.Woodhouse@intel.com>
	Wed, 6 Jan 2010 16:18:34 +0000 (16:18 +0000)
committer	David Woodhouse <David.Woodhouse@intel.com>
	Wed, 6 Jan 2010 16:23:47 +0000 (16:23 +0000)
commit	c103430a955a286e459a658d6300557fb1d72ad4
tree	747d659d257a745c46e7c7c514b4b1d075875b84	tree
parent	7a03541078aae167bd6755f602dd59a85b363c27	commit \| diff
parent	fc2a85dec30097afd7b86c08d56424bbd120d655	commit \| diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/linux-firmware-from-kernel

Conflicts:
WHENCE

linux-firmware mirror