git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f1a11e0
64d1304
)
Merge branch 'core/urgent' into core/futexes
author
Thomas Gleixner
<tglx@linutronix.de>
Wed, 20 May 2009 07:02:28 +0000
(09:02 +0200)
committer
Thomas Gleixner
<tglx@linutronix.de>
Wed, 20 May 2009 07:02:28 +0000
(09:02 +0200)
Merge reason: this branch was on an pre -rc1 base, merge it up to -rc6+
to get the latest upstream fixes.
Conflicts:
kernel/futex.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff