Merge changes made on two different machines...

author Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Thu, 9 Aug 2012 15:15:54 +0000 (08:15 -0700)

committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Thu, 9 Aug 2012 15:16:04 +0000 (08:16 -0700)
author Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Aug 2012 15:15:54 +0000 (08:15 -0700)
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Aug 2012 15:16:04 +0000 (08:16 -0700)
diff --cc review-3.0/m68k-correct-the-atari-allowint-definition.patch
Simple merge
diff --cc review-3.4/m68k-correct-the-atari-allowint-definition.patch
Simple merge
author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Thu, 9 Aug 2012 15:15:54 +0000 (08:15 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Thu, 9 Aug 2012 15:16:04 +0000 (08:16 -0700)
		1	2
review-3.0/m68k-correct-the-atari-allowint-definition.patch	patch \|	diff1 \|	diff2 \|	blob \| history
review-3.4/m68k-correct-the-atari-allowint-definition.patch	patch \|	diff1 \|	diff2 \|	blob \| history