Merge commit 'linus/master' into merge-linus

Conflicts: arch/x86/kvm/i8254.c
2008-10-17 09:20:26 -07:00
parent 40b8606253 2e532d68a2
commit 651dab4264
6288 changed files with 355612 additions and 162690 deletions
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -29,6 +29,8 @@ struct timezone {

 #ifdef __KERNEL__

+extern struct timezone sys_tz;
+
 /* Parameters used to convert the timespec values: */
 #define MSEC_PER_SEC	1000L
 #define USEC_PER_MSEC	1000L