diff options
author | David S. Miller <davem@davemloft.net> | 2012-11-11 00:32:51 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-11-11 00:32:51 +0100 |
commit | d4185bbf62a5d8d777ee445db1581beb17882a07 (patch) | |
tree | 024b0badbd7c970b1983be6d8c345cc4a290cb31 /arch/hexagon/mm/pgalloc.c | |
parent | ip6tnl: advertise tunnel param via rtnl (diff) | |
parent | gre6: fix rtnl dump messages (diff) | |
download | linux-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/mm/pgalloc.c')
-rw-r--r-- | arch/hexagon/mm/pgalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/hexagon/mm/pgalloc.c b/arch/hexagon/mm/pgalloc.c index b175e2d42b89..19760a4611d9 100644 --- a/arch/hexagon/mm/pgalloc.c +++ b/arch/hexagon/mm/pgalloc.c @@ -1,5 +1,5 @@ /* - * 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 |