From: Linus Torvalds <torvalds@linux-foundation.org> Date: Mon, 21 Feb 2011 22:55:49 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 X-Git-Tag: firefly_0821_release~7613^2~2406 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f85cca6b25971a09efbe4c6a3ae405d40c8f86da;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] net: provide architecture specific NET_SKB_PAD [S390] atomic: use inline asm [S390] correct ipl parameter block safe guard [S390] atomic: use ACCESS_ONCE() for atomic_read() [S390] dasd: correct device table --- f85cca6b25971a09efbe4c6a3ae405d40c8f86da