Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

fs/buffer.c

@@ -76,7 +76,7 @@ EXPORT_SYMBOL(__lock_buffer);
 void fastcall unlock_buffer(struct buffer_head *bh)
 {
 	clear_buffer_locked(bh);
-	smp_mb();
+	smp_mb__after_clear_bit();
 	wake_up_bit(&bh->b_state, BH_Lock);
 }
 

mm/filemap.c

@@ -420,8 +420,8 @@ void end_page_writeback(struct page *page)
 	if (!TestClearPageReclaim(page) || rotate_reclaimable_page(page)) {
 		if (!test_clear_page_writeback(page))
 			BUG();
-		smp_mb__after_clear_bit();
 	}
+	smp_mb__after_clear_bit();
 	wake_up_page(page, PG_writeback);
 }