Merge branch 'before_spinlock'
commitd9699a8a34b67bb649dcef20a824f838ebdd34fe
authorDaniel Borkmann <borkmann@gnumaniacs.org>
Thu, 12 May 2011 12:04:50 +0000 (12 14:04 +0200)
committerDaniel Borkmann <borkmann@gnumaniacs.org>
Thu, 12 May 2011 12:04:50 +0000 (12 14:04 +0200)
tree30c48715738d64d1b5616404787ba0cbd9e644f4
parente84ad8d5766623cf835b5978ab528e555b9cb8f8
parent07a76293cb76741fff93d76be03db24abd9146eb
Merge branch 'before_spinlock'

Conflicts:
src/xt_sched.c
src/xt_sched.c