Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h

1 files changed, 2 insertions, 1 deletions

diff --git a/lib/lmb.c b/lib/lmb.c
index 867f7b5a8231..5d7b9286503e 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -48,7 +48,8 @@ void lmb_dump_all(void)
         }
 
         pr_info("    reserved.cnt         = 0x%lx\n", lmb.reserved.cnt);
-        pr_info("    reserved.size        = 0x%lx\n", lmb.reserved.size);
+        pr_info("    reserved.size        = 0x%llx\n",
+            (unsigned long long)lmb.memory.size);
         for (i=0; i < lmb.reserved.cnt ;i++) {
                 pr_info("    reserved.region[0x%lx].base       = 0x%llx\n",
                     i, (unsigned long long)lmb.reserved.region[i].base);