git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eaa5eec b02957d)
Staging: merge staging patches into Linus's main branch
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 4 Mar 2010 16:39:02 +0000 (08:39 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 4 Mar 2010 16:39:02 +0000 (08:39 -0800)
There were a number of patches that went into Linus's
tree already that conflicted with other changes in the
staging branch.  This merge resolves those merge conflicts.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Trivial merge
Pandora Kernel Repository