]> git.karo-electronics.de Git - karo-tx-linux.git/commit - include/acpi/actbl.h
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 530ede1 d7011f5)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Mar 2013 21:13:20 +0000 (13:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Mar 2013 21:13:20 +0000 (13:13 -0800)
commit1c82315a12144cde732636e259d39e3ee81b3c5b
tree904770abe925abf1e37bad1a6d7d7f576257b194tree | snapshot
parent530ede14cf63ef4a207b0003e14af2f750484180commit | diff
parentd7011f5b9dd3c88feb5cebad7d0b719ed6816ebdcommit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs fixup from Chris Mason:
 "Geert and James both sent this one in, sorry guys"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs/raid56: Add missing #include <linux/vmalloc.h>
Linux kernel for KaRo TX COM modules