From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 18 Mar 2011 09:38:53 +0000 (+0100)
Subject: Merge branch 'linus' into x86/urgent
X-Git-Tag: upstream/snapshot3+hdmi~10811^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8dd8997d2c56c9f248294805e129e1fc69444380;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'linus' into x86/urgent

Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

8dd8997d2c56c9f248294805e129e1fc69444380
diff --cc arch/x86/include/asm/amd_nb.h
index 527fb96,e264ae5..3316822
--- a/arch/x86/include/asm/amd_nb.h
+++ b/arch/x86/include/asm/amd_nb.h
@@@ -13,11 -13,10 +13,10 @@@ extern const struct pci_device_id amd_n
  extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];
  struct bootnode;
  
 -extern int early_is_amd_nb(u32 value);
 +extern bool early_is_amd_nb(u32 value);
  extern int amd_cache_northbridges(void);
  extern void amd_flush_garts(void);
- extern int amd_numa_init(unsigned long start_pfn, unsigned long end_pfn);
- extern int amd_scan_nodes(void);
+ extern int amd_numa_init(void);
  extern int amd_get_subcaches(int);
  extern int amd_set_subcaches(int, int);