Merge branch 'smp' into misc

Conflicts:
	arch/arm/kernel/entry-armv.S
	arch/arm/mm/ioremap.c
This commit is contained in:
Russell King
2011-01-06 22:31:35 +00:00
1391 changed files with 25607 additions and 12357 deletions

View File

@@ -17,4 +17,4 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#define VMALLOC_END 0xd0000000
#define VMALLOC_END 0xd0000000UL