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/init_task.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/init_task.h')
-rw-r--r-- | include/linux/init_task.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 08ffab01e76c..94b1e356c02a 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -184,7 +184,6 @@ extern struct cred init_cred; [PIDTYPE_SID] = INIT_PID_LINK(PIDTYPE_SID), \ }, \ .thread_group = LIST_HEAD_INIT(tsk.thread_group), \ - .dirties = INIT_PROP_LOCAL_SINGLE(dirties), \ INIT_IDS \ INIT_PERF_EVENTS(tsk) \ INIT_TRACE_IRQFLAGS \ |