tree c9d47587ac07cb1622156899414c78f097fcb0c9
parent 092e0e7e520a1fca03e13c9f2d157432a8657ff2
parent 35dbc0e020c6587f78a6c17693beca73aead7b54
author Linus Torvalds <torvalds@linux-foundation.org> 1287771426 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1287771426 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

* git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic/io.h: allow people to override individual funcs
  bitops: remove duplicated extern declarations
  bitops: make asm-generic/bitops/find.h more generic
  asm-generic: kdebug.h: Checkpatch cleanup
  asm-generic: fcntl: make exported headers use strict posix types
  asm-generic: cmpxchg does not handle non-long arguments
  asm-generic: make atomic_add_unless a function