Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 2 insertions, 3 deletions

diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index d6eee291a0e2..39bddba53ba1 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -401,9 +401,8 @@ static int cache_clean(void)
                 for (; ch; cp= & ch->next, ch= *cp) {
                         if (current_detail->nextcheck > ch->expiry_time)
                                 current_detail->nextcheck = ch->expiry_time+1;
-                        if (ch->expiry_time >= get_seconds()
-                            && ch->last_refresh >= current_detail->flush_time
-                                )
+                        if (ch->expiry_time >= get_seconds() &&
+                            ch->last_refresh >= current_detail->flush_time)
                                 continue;
                         if (test_and_clear_bit(CACHE_PENDING, &ch->flags))
                                 cache_dequeue(current_detail, ch);