Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

  From Webster's Revised Unabridged Dictionary (1913) [web1913]:

    So-called \So"-called`\, a.
       So named; called by such a name (but perhaps called thus with
       doubtful propriety).

  From WordNet (r) 2.0 [wn]:

    so-called
         adj : doubtful or suspect; "these so-called experts are no help"
               [syn: {alleged(a)}, {supposed}]

My strong conviction is that widespread use of 'so gennant'
or 'sogennant' in German has led to the creeping misuse of
'so-called' in English (especially through technical writings).

In English, it would be better to use:

  what is called

or a better translation of 'so gennant':

  so named
Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

Signed-off-by: Michael Witten <mfwitten@gmail.com>

In commit a144c6a6 ("PM: Print a warning if firmware is requested
when tasks are frozen") we not only printed a warning if somebody tried
to load the firmware when tasks are frozen - we also failed the load.

But that check was done before the check for built-in firmware, and then
when we disallowed usermode helpers during bootup (commit 288d5abe:
"Boot up with usermodehelper disabled"), that actually means that
built-in modules can no longer load their firmware even if the firmware
is built in too.  Which used to work, and some people depended on it for
the R100 driver.

So move the test for usermodehelper_is_disabled() down, to after
checking the built-in firmware.

This should fix:

	https://bugzilla.kernel.org/show_bug.cgi?id=40952Reported-by: James Cloos <cloos@hjcloos.com>
Bisected-by: Elimar Riesebieter <riesebie@lxtec.de>
Cc: Michel Dänzer <michel@daenzer.net>
Cc: Rafael Wysocki <rjw@sisk.pl>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

* 'for-31-rc3/i2c-fixes' of git://git.fluff.org/bjdooks/linux:
  i2c-nomadik: fix kerneldoc warning
  Revert "i2c-omap: fix static suspend vs. runtime suspend"
  i2c-nomadik: Do not use _interruptible_ variant call

There was a missing struct item in the kerneldoc, add it and fix
another pretty-printing formatting issue with a missing space.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: wiimote: Add status and return request handlers
  HID: wiimote: Add drm request
  HID: wiimote: Register led class devices
  HID: wiimote: Correctly call HID open/close callbacks
  HID: wiimote: Simplify synchronization
  HID: usbhid: Add support for SiGma Micro chip
  HID: add support for new revision of Apple aluminum keyboard

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: ad714x - read the interrupt status registers in a row
  Input: ad714x - use DMA-safe buffers for spi_write()
  Input: ad714x - fix endianness issues
  Input: ad714xx-spi - force SPI bus into the default 8-bit mode
  Input: ep93xx_keypad - add missing include of linux/module.h
  Input: tnetv107x-ts - add missing include of linux/module.h
  Input: max11801_ts - correct license statement
  Input: atmel_mxt_ts - report pressure information from the driver
  Input: bcm5974 - Add support for newer MacBookPro8,2
  Input: wacom - report id 3 returns 4 bytes of data
  Input: wacom - add WAC_MSG_RETRIES define
  Input: wacom - add support for the Wacom Bamboo Pen (CTL-660/K)
  Input: tegra-kbc - correct call to input_free_device
  Input: mpu3050 - correct call to input_free_device
  Input: bcm5974 - add support for touchpads found in MacBookAir4,2
  Input: mma8450 - fix module device table type
  Input: remove CLOCK_TICK_RATE from analog joystick driver

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message
  fuse: mark pages accessed when written to
  fuse: delete dead .write_begin and .write_end aops
  fuse: fix flock
  fuse: fix non-ANSI void function notation