Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

Conflicts:
	Makefile
	drivers/net/wireless/rt2x00/rt2x00usb.c

diff --cc fs/buffer.c
Simple merge

diff --cc kernel/time/timekeeping.c
index 9b28d0407715088b86dea6926290dda269ba24b4,678ae3184efd24a024b32827644eb8d244eca01c..84d4f8b25f32162688891c49b529108f983a18b9
--- 1/kernel/time/timekeeping.c
--- 2/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@@ -608,15 -627,9 +627,15 @@@ static void update_sleep_time(struct ti
   */
  static void __timekeeping_inject_sleeptime(struct timespec *delta)
  {
 +      if (!timespec_valid(delta)) {
 +              printk(KERN_WARNING "__timekeeping_inject_sleeptime: Invalid "
 +                                      "sleep delta value!\n");
 +              return;
 +      }
 +
        xtime = timespec_add(xtime, *delta);
        wall_to_monotonic = timespec_sub(wall_to_monotonic, *delta);
-       total_sleep_time = timespec_add(total_sleep_time, *delta);
+       update_sleep_time(timespec_add(total_sleep_time, *delta));
  }