Merge commit 'linus/master' into sched-fixes-for-linus

diff --combined include/linux/sched.h
index 8a888499954e3c9b1056eaff9d889b7970a932a4,3e05e547474977da3a31495c0907a1b34674a756..ae0be3c6237543f63da1a64bc7cf0b0dc3d8b88d
--- 1/include/linux/sched.h
--- 2/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -766,6 -766,7 +766,6 @@@ struct sched_domain 
        struct sched_domain *child;     /* bottom domain must be null terminated */
        struct sched_group *groups;     /* the balancing groups of the domain */
        cpumask_t span;                 /* span of all CPUs in this domain */
 -      int first_cpu;                  /* cache of the first cpu in this domain */
        unsigned long min_interval;     /* Minimum balance interval ms */
        unsigned long max_interval;     /* Maximum balance interval ms */
        unsigned int busy_factor;       /* less balancing by factor if busy */
@@@ -1847,7 -1848,9 +1847,9 @@@ extern void exit_thread(void)
  extern void exit_files(struct task_struct *);
  extern void __cleanup_signal(struct signal_struct *);
  extern void __cleanup_sighand(struct sighand_struct *);
+ 
  extern void exit_itimers(struct signal_struct *);
+ extern void flush_itimer_signals(void);
  
  extern NORET_TYPE void do_group_exit(int);