Merge branch 'poll' into staging/for_v3.4

* poll: (5970 commits)
  poll: add poll_requested_events() and poll_does_not_wait() functions
  crc32: select an algorithm via Kconfig
  crc32: add self-test code for crc32c
  crypto: crc32c should use library implementation
  crc32: bolt on crc32c
  crc32: add note about this patchset to crc32.c
  crc32: optimize loop counter for x86
  crc32: add slice-by-8 algorithm to existing code
  crc32: make CRC_*_BITS definition correspond to actual bit counts
  crc32: fix mixing of endian-specific types
  crc32: miscellaneous cleanups
  crc32: simplify unit test code
  crc32: move long comment about crc32 fundamentals to Documentation/
  crc32: remove two instances of trailing whitespaces
  checkpatch: check for quoted strings broken across lines
  checkpatch: whitespace - add/remove blank lines
  checkpatch: warn on use of yield()
  checkpatch: add --strict tests for braces, comments and casts
  checkpatch: add [] to type extensions
  checkpatch: high precedence operators do not require additional parentheses in #defines
  ...

1 files changed, 47 insertions, 0 deletions

diff --git a/drivers/staging/telephony/Kconfig b/drivers/staging/telephony/Kconfig
new file mode 100644
index 0000000..b5f78b6
--- /dev/null
+++ b/drivers/staging/telephony/Kconfig
@@ -0,0 +1,47 @@
+#
+# Telephony device configuration
+#
+
+menuconfig PHONE
+	tristate "Telephony support"
+	depends on HAS_IOMEM
+	---help---
+	  Say Y here if you have a telephony card, which for example allows
+	  you to use a regular phone for voice-over-IP applications.
+
+	  Note: this has nothing to do with modems.  You do not need to say Y
+	  here in order to be able to use a modem under Linux.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called phonedev.
+
+if PHONE
+
+config PHONE_IXJ
+	tristate "QuickNet Internet LineJack/PhoneJack support"
+	depends on ISA || PCI
+	---help---
+	  Say M if you have a telephony card manufactured by Quicknet
+	  Technologies, Inc.  These include the Internet PhoneJACK and
+	  Internet LineJACK Telephony Cards. You will get a module called
+	  ixj.
+
+	  For the ISA versions of these products, you can configure the
+	  cards using the isapnp tools (pnpdump/isapnp) or you can use the
+	  isapnp support.  Please read <file:Documentation/telephony/ixj.txt>.
+
+	  For more information on these cards, see Quicknet's web site at:
+	  <http://www.quicknet.net/>.
+
+	  If you do not have any Quicknet telephony cards, you can safely
+	  say N here.
+
+config PHONE_IXJ_PCMCIA
+	tristate "QuickNet Internet LineJack/PhoneJack PCMCIA support"
+	depends on PHONE_IXJ && PCMCIA
+	help
+	  Say Y here to configure in PCMCIA service support for the Quicknet
+	  cards manufactured by Quicknet Technologies, Inc.  This changes the
+	  card initialization code to work with the card manager daemon.
+
+endif # PHONE