projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 59cd358 731a737)
Merge branch 'linus' into perf/urgent
authorIngo Molnar <mingo@kernel.org>
Wed, 30 May 2012 08:59:04 +0000 (10:59 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 30 May 2012 08:59:04 +0000 (10:59 +0200)
commit063e04776172f93b16a5eefd5661a340c1126513
tree19cb1623631c8cc5dcf0d91f4731feec7cbefa04tree | snapshot
parent59cd358a7a5b2f6b61faa01dae6cfda3830ac62acommit | diff
parent731a7378b81c2f5fa88ca1ae20b83d548d5613dccommit | diff
Merge branch 'linus' into perf/urgent

Merge back Linus's latest branch so that we pick up the uprobes changes.

( I tested this branch locally and while it's one from the middle of the
  merge window it's a good one to base further work off. )

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Unnamed repository; edit this file 'description' to name the repository.