projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3f0d0c9 6c2580c)
Merge branch 'master' into virtio-next
authorRusty Russell <rusty@rustcorp.com.au>
Fri, 9 Aug 2013 03:30:39 +0000 (13:00 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Fri, 9 Aug 2013 03:30:39 +0000 (13:00 +0930)
commit11489736177c5930514482b4db7af862d945335d
tree8590ec4ba037b79c94982e15922fe50a1f0193a3tree | snapshot (tar.gz zip)
parent3f0d0c9b47e09d47fcb755fed786a1ee88e110b5commit | diff
parent6c2580c501c660fdfb506061e016d84570fceba1commit | diff
Merge branch 'master' into virtio-next

The next commit gets conflicts because it relies on patches which were
cc:stable and thus had to be merged into Linus' tree before the coming
merge window.  So pull in master now.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
drivers/char/virtio_console.c diff1 | diff2 | blob | history