diff options
author | Greg Kroah-Hartman | 2011-11-27 05:07:25 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2011-11-27 05:07:25 +0100 |
commit | dd7c7c3f69291baa488b8a50db683d5fbf44166a (patch) | |
tree | 925bf294f30dffaa67a983c3859926ff53937e14 /include/linux/sched.h | |
parent | UART: add CSR SiRFprimaII SoC on-chip uart drivers (diff) | |
parent | Linux 3.2-rc3 (diff) | |
download | kernel-qcow2-linux-dd7c7c3f69291baa488b8a50db683d5fbf44166a.tar.gz kernel-qcow2-linux-dd7c7c3f69291baa488b8a50db683d5fbf44166a.tar.xz kernel-qcow2-linux-dd7c7c3f69291baa488b8a50db683d5fbf44166a.zip |
Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 68daf4f27e2c..1c4f3e9b9bc5 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1521,7 +1521,6 @@ struct task_struct { #ifdef CONFIG_FAULT_INJECTION int make_it_fail; #endif - struct prop_local_single dirties; /* * when (nr_dirtied >= nr_dirtied_pause), it's time to call * balance_dirty_pages() for some dirty throttling pause |