]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eb2f336 1c9f18c)
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)
commit277bf2dfd255bea8bc7d1a0b1f5ba9551d515cd7
tree8590ec4ba037b79c94982e15922fe50a1f0193a3tree | snapshot
parenteb2f33666dfd218068e6603cb426f7bde2bba0d4commit | diff
parent1c9f18c6b080d91e4d63f41aad1706515fb18682commit | 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
Linux Kernel Source Tree.