Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Dec 2009 04:57:31 +0000 (20:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Dec 2009 04:57:31 +0000 (20:57 -0800)
commita1c36e52068a59374e127d60e4d8f4377072fc98
tree1f17d2bc113286f60fc4922910fbd252e77326ba
parent3070f27d6ecb69364e7cffe16c8b15e1b8ef41dd
parent3d7703870633dd454f6554e6d8d7f70441d0fd2d
Merge git://git./linux/kernel/git/arnd/asm-generic

* git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: add sys_recvmmsg to unistd.h
  asm-generic: add sys_accept4 to unistd.h
  asm-generic/gpio.h: add some forward decls of the device struct
  asm-generic: Fix typo in asm-generic/unistd.h.
  lib/checksum: fix one more thinko
  lib/checksum.c: make do_csum optional
  lib/checksum.c: use 32-bit arithmetic consistently
include/asm-generic/unistd.h