Merge branch 'out-of-tree'
commit5d098609e4368e7f5b5f97166d7e4f1012a8b16e
authorIngo Molnar <mingo@elte.hu>
Thu, 30 Jun 2011 20:17:33 +0000 (30 22:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 30 Jun 2011 20:17:33 +0000 (30 22:17 +0200)
treeaf7e434e39edd1e8e349f81f42ebd2080e54fba7
parent6edb338e256e74152c2890490f782ebe3e9f6b02
parent38b3d7fbd3a2f41ea73fea6d8bbe3fb3b3ba0f6d
Merge branch 'out-of-tree'
Makefile
arch/x86/include/asm/apb_timer.h