| commit | 989fa940961faa9d51f073bafa58c2b5653d5969 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 15 Jul 2009 01:35:00 +0000 (14 18:35 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 15 Jul 2009 01:35:00 +0000 (14 18:35 -0700) | ||
| tree | 1d28774b8449b0a840b2cc396fd6229e7549fde2 | treesnapshot (tar.gz zip) |
| parent | c0c50b541a4b147c5c2572ed051420238c47f57a | commitdiff |
| parent | ce2ae53b750abfaa012ce408e93da131a5b5649b | commitdiff |
Merge branch 'core-fixes-for-linus-2' of git://git./linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
futexes: Fix infinite loop in get_futex_key() on huge page
* 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
futexes: Fix infinite loop in get_futex_key() on huge page