author | Tony Lindgren <tony@atomide.com> | |
Thu, 3 Nov 2011 00:31:14 +0000 (17:31 -0700) | ||
committer | Tony Lindgren <tony@atomide.com> | |
Thu, 3 Nov 2011 00:31:14 +0000 (17:31 -0700) | ||
commit | a98bb4392c7dba88a375cce90bcbe45c85f9eedd | |
tree | 7bf4ebd25f57168e64f313e38537e81389dd3485 | tree | snapshot (tar.xz tar.gz zip) |
parent | 13358ff6b0296c90a635e4666be7ee45c8fdfa7b | commit | diff |
parent | 994c0e992522c123298b4a91b72f5e67ba2d1123 | commit | diff |
Merge branch 'linus' into cbus
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Conflicts:
arch/arm/mach-omap1/board-nokia770.c