tree b1698fe26ca610c23026bd87e727fa97746f6c7f
parent 4c0b72f278ab643208d4a88c326acbe0292dfe50
parent 76e230e41947576efb96e86e605bb84015cdb287
author JP Abgrall <jpa@google.com> 1396462834 -0700
committer JP Abgrall <jpa@google.com> 1396462834 -0700

Merge remote-tracking branch 'upstream/stable-1.4.20' into update

Conflicts:
	.gitignore
	include/linux/types.h
	libiptc/libiptc.c

Change-Id: I2c949ba9de090db9ae09d914f4ac5c13e5b7d4da