git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b364776 2515ddc)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 21 Oct 2008 18:42:20 +0000 (19:42 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 21 Oct 2008 18:42:20 +0000 (19:42 +0100)
Conflicts:

drivers/pci/dmar.c


Trivial merge
Pandora Kernel Repository