summaryrefslogtreecommitdiffstats
path: root/arch/um/Makefile-i386
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-07-22 23:08:48 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-07-22 23:08:48 +0100
commit06f365acef5ca54fd5708a0d853c4a89609536f1 (patch)
treee2fb0146d450077dd95e4ae178ff56e72d3d89b5 /arch/um/Makefile-i386
parent4348810a241a330d3d143d62d7c988ec8b2e6629 (diff)
parent022ae537b23cb14a391565e9ad9e9945f4b17138 (diff)
parent30891c90d81133179cc47eb77c30764a3b5dad5c (diff)
parente7d59db91a346f5069692e3b1f4e0afd100096dc (diff)
parente2f81844efa2d44d326bef48e1c9e48926162bc6 (diff)
parent4cde7e0dca98e0e93dceb174d83f766d0d637c23 (diff)
parent7f294e4983b67be802277d139522837b3ce5769f (diff)
parent29cb3cd208dd0e4471bb80bec4facc49ceb199fa (diff)
parent19dad35fe0f10df8f0524f98037469e3a0dd1ec2 (diff)
Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', 'suspend' and 'vfp' into for-next