]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: f1a11e0 64d1304)
Merge branch 'core/urgent' into core/futexes
authorThomas Gleixner <tglx@linutronix.de>
Wed, 20 May 2009 07:02:28 +0000 (09:02 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 20 May 2009 07:02:28 +0000 (09:02 +0200)
commit521c180874dae86f675d23c4eade4dba8b1f2cc8
tree7509303da3a9a1b40a26f6811f321c89cd31737btree
parentf1a11e0576c7a73d759d05d776692b2b2d37172bcommit | diff
parent64d1304a64477629cb16b75491a77bafe6f86963commit | diff
Merge branch 'core/urgent' into core/futexes

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>
kernel/futex.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.