From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Jun 2011 17:36:32 +0000 (-0700)
Subject: Merge branches 'gpio/merge' and 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.0-rc4~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0835619348b097404f4f85bc5195c6e23a2f8de4;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branches 'gpio/merge' and 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
  gpio: add GPIOF_ values regardless on kconfig settings
  gpio: include linux/gpio.h where needed
  gpio/omap4: Fix missing interrupts during device wakeup due to IOPAD.

* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
  spi/bfin_spi: fix handling of default bits per word setting
---

0835619348b097404f4f85bc5195c6e23a2f8de4