]> spindle.queued.net Git - linux-firmware/commitdiff
projects / linux-firmware / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a652b07 aeb537e)
Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2...
authorDavid Woodhouse <David.Woodhouse@intel.com>
Sun, 19 Apr 2009 19:37:33 +0000 (20:37 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Sun, 19 Apr 2009 19:37:33 +0000 (20:37 +0100)
Conflicts:
WHENCE

1  2 
WHENCE patch | diff1 | diff2 | blob | history

diff --cc WHENCE
Simple merge
linux-firmware branch with OLPC's libertas blobs included