summaryrefslogtreecommitdiffstats
path: root/arch/hexagon/include/asm/mmu_context.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-11-11 00:32:51 +0100
committerDavid S. Miller <davem@davemloft.net>2012-11-11 00:32:51 +0100
commitd4185bbf62a5d8d777ee445db1581beb17882a07 (patch)
tree024b0badbd7c970b1983be6d8c345cc4a290cb31 /arch/hexagon/include/asm/mmu_context.h
parentip6tnl: advertise tunnel param via rtnl (diff)
parentgre6: fix rtnl dump messages (diff)
downloadlinux-d4185bbf62a5d8d777ee445db1581beb17882a07.tar.xz
linux-d4185bbf62a5d8d777ee445db1581beb17882a07.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c Minor conflict between the BCM_CNIC define removal in net-next and a bug fix added to net. Based upon a conflict resolution patch posted by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/hexagon/include/asm/mmu_context.h')
-rw-r--r--arch/hexagon/include/asm/mmu_context.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/hexagon/include/asm/mmu_context.h b/arch/hexagon/include/asm/mmu_context.h
index b4fe5a5411b6..d423d2e73c30 100644
--- a/arch/hexagon/include/asm/mmu_context.h
+++ b/arch/hexagon/include/asm/mmu_context.h
@@ -1,7 +1,7 @@
/*
* MM context support for the Hexagon architecture
*
- * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and