| commit | 521c180874dae86f675d23c4eade4dba8b1f2cc8 | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Wed May 20 09:02:28 2009 +0200 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Wed May 20 09:02:28 2009 +0200 |
| tree | 7509303da3a9a1b40a26f6811f321c89cd31737b | |
| parent | f1a11e0576c7a73d759d05d776692b2b2d37172b [diff] | |
| parent | 64d1304a64477629cb16b75491a77bafe6f86963 [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>