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

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ar9170/usb.c
	drivers/scsi/iscsi_tcp.c
	net/ipv4/ipmr.c

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/nwfpe/entry.S b/arch/arm/nwfpe/entry.S
index 48bca0db4607..cafa18354339 100644
--- a/arch/arm/nwfpe/entry.S
+++ b/arch/arm/nwfpe/entry.S
@@ -111,12 +111,12 @@ next:
         @ to fault.  Emit the appropriate exception gunk to fix things up.
         @ ??? For some reason, faults can happen at .Lx2 even with a
         @ plain LDR instruction.  Weird, but it seems harmless.
-        .section .fixup,"ax"
+        .pushsection .fixup,"ax"
         .align  2
 .Lfix:  mov     pc, r9                  @ let the user eat segfaults
-        .previous
+        .popsection
 
-        .section __ex_table,"a"
+        .pushsection __ex_table,"a"
         .align  3
         .long   .Lx1, .Lfix
-        .previous
+        .popsection