]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 562e14b 3323003)
Merge remote-tracking branch 'stevee/imx6q-wandboard-rbased' into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 23 Dec 2013 21:24:23 +0000 (22:24 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 23 Dec 2013 21:24:23 +0000 (22:24 +0100)
1  2 
lfs/linux patch | diff1 | diff2 | blob | history

diff --cc lfs/linux
Simple merge
Peter's tree of IPFire 2.x