Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next

Conflicts:
    include/linux/ssb/ssb_driver_gige.h

Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.

1 files changed, 2 insertions, 4 deletions

diff --git a/kernel/timeconst.pl b/kernel/timeconst.pl
index eb51d76e058a..3f42652a6a37 100644
--- a/kernel/timeconst.pl
+++ b/kernel/timeconst.pl
@@ -369,10 +369,8 @@ if ($hz eq '--can') {
                 die "Usage: $0 HZ\n";
         }
 
-        @val = @{$canned_values{$hz}};
-        if (!defined(@val)) {
-                @val = compute_values($hz);
-        }
+        $cv = $canned_values{$hz};
+        @val = defined($cv) ? @$cv : compute_values($hz);
         output($hz, @val);
 }
 exit 0;