]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0afa80a ed01f64)
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Apr 2010 02:49:50 +0000 (19:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Apr 2010 02:49:50 +0000 (19:49 -0700)
commitd4509e5a6edf8862c18d887a642ce4994bde297d
tree51669f2e0fa6004fb02c5907c2957a48d025c2a1tree
parent0afa80ab6ff9aac57f118463699cee306ad6ed8acommit | diff
parented01f64b831481762437c8eedddcca8481dc7f67commit | diff
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6

* 'merge' of git://git.secretlab.ca/git/linux-2.6:
  powerpc/5200: in lpbfifo, flag DMA irqs as enabled after requesting them
  powerpc/fsl: add device tree binding for QE firmware
  of/flattree: Fix unhandled OF_DT_NOP tag when unflattening the device tree
Ubuntu Disco kernel mirror for Proxmox VE and PMG