summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-08-30DocBook/drm: Remove extraneous commasMichael Witten1-2/+2
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-30DocBook/drm: Use a colonMichael Witten1-1/+1
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-30DocBook/drm: Clarify `final initialization' via better formattingMichael Witten1-4/+13
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-30DocBook/drm: Remove redundancyMichael Witten1-2/+1
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-30DocBook/drm: Insert `it' for smooth readingMichael Witten1-1/+1
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-30DocBook/drm: The word `so-called'; I do not think it connotes what you think ↵Michael Witten1-1/+1
it connotes 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>
2011-08-29DocBook/drm: Use a singular subject for grammatical cleanlinessMichael Witten1-4/+4
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: basic -> coreMichael Witten1-1/+1
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Streamline wording of GEM initializationMichael Witten1-1/+1
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Insert `()' after function nameMichael Witten1-4/+4
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Remove parentheses and unnecessary repetitionMichael Witten1-2/+2
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Insert missing commaMichael Witten1-5/+5
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: , -> :Michael Witten1-2/+2
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: can -> couldMichael Witten1-1/+1
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Offset modifiers with commasMichael Witten1-4/+4
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Use the passive voiceMichael Witten1-3/+3
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: `at driver load time' -> `when the driver is loaded'Michael Witten1-1/+1
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: `setup' is the noun; `to set up' is the verbMichael Witten1-1/+1
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Insert missing `an'Michael Witten1-1/+1
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Insert missing `that'Michael Witten1-2/+2
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Clearer wording with `for consumption by'Michael Witten1-2/+2
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Better wordingMichael Witten1-2/+2
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Replace the paragraph's first sentence with its last sentenceMichael Witten1-7/+5
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Rearrange wording to make more senseMichael Witten1-3/+3
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Clean up `pre-memory management aware'Michael Witten1-1/+1
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Move `should be set' to the beginning of the sentenceMichael Witten1-2/+2
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: , -> .Michael Witten1-1/+1
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: a -> anMichael Witten1-1/+1
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Use a semicolonMichael Witten1-4/+4
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-29DocBook/drm: Clean up code commentMichael Witten2-4/+4
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-26DocBook/drm: can -> mayMichael Witten1-10/+10
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-25DocBook/drm: Eradicate inappropriate uses of the future tenseMichael Witten1-25/+25
Signed-off-by: Michael Witten <mfwitten@gmail.com>
2011-08-25firmware loader: allow builtin firmware load even if usermodehelper is disabledLinus Torvalds1-5/+6
In commit a144c6a6c924 ("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 288d5abec831: "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=40952 Reported-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>
2011-08-25Merge branch 'for-31-rc3/i2c-fixes' of git://git.fluff.org/bjdooks/linuxLinus Torvalds2-33/+5
* '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
2011-08-25i2c-nomadik: fix kerneldoc warningLinus Walleij1-1/+2
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>
2011-08-24Merge branch 'for-linus' of ↵Linus Torvalds6-94/+200
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * '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
2011-08-24Merge branch 'for-linus' of ↵Linus Torvalds15-145/+241
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * '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
2011-08-24Merge branch 'for-linus' of ↵Linus Torvalds5-75/+40
git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse * '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
2011-08-24Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparcLinus Torvalds8-233/+468
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc: Allow handling signals when stack is corrupted.
2011-08-24Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds27-110/+433
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits) bridge: fix a possible net_device leak net: Documentation: RFC 2553bis is now RFC 3493 atm: br2684: Fix oops due to skb->dev being NULL ipv6: Fix ipv6_getsockopt for IPV6_2292PKTOPTIONS net: netdev-features.txt update to Documentation/networking/00-INDEX vlan: reset headers on accel emulation path forcedeth: call vlan_mode only if hw supports vlans via-velocity: remove non-tagged packet filtering bonding:reset backup and inactive flag of slave net_sched: fix port mirror/redirect stats reporting sit tunnels: propagate IPv6 transport class to IPv4 Type of Service gianfar: reduce stack usage in gianfar_ethtool.c net: minor update to Documentation/networking/scaling.txt net: add missing entries to Documentation/networking/00-INDEX gianfar: prevent buggy hw rx vlan tagging net: sh_eth: Fix build by forgot including linux/interrupt.h drivers/net/can/sja1000/plx_pci.c: eliminate double free usbnet/cdc_ncm: Don't use stack variables for DMA vmxnet3: Don't enable vlan filters in promiscuous mode. iwlagn: sysfs couldn't find the priv pointer ...
2011-08-24Merge branches 'wiimote' and 'upstream-fixes' into for-linusJiri Kosina4-0/+16
2011-08-24fuse: check size of FUSE_NOTIFY_INVAL_ENTRY messageMiklos Szeredi1-0/+4
FUSE_NOTIFY_INVAL_ENTRY didn't check the length of the write so the message processing could overrun and result in a "kernel BUG at fs/fuse/dev.c:629!" Reported-by: Han-Wen Nienhuys <hanwenn@gmail.com> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> CC: stable@kernel.org
2011-08-24Merge branch 'x86-urgent-for-linus' of ↵Linus Torvalds3-4/+3
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-32, vdso: On system call restart after SYSENTER, use int $0x80 x86, UV: Remove UV delay in starting slave cpus x86, olpc: Wait for last byte of EC command to be accepted
2011-08-24x86-32, vdso: On system call restart after SYSENTER, use int $0x80H. Peter Anvin1-1/+1
When we enter a 32-bit system call via SYSENTER or SYSCALL, we shuffle the arguments to match the int $0x80 calling convention. This was probably a design mistake, but it's what it is now. This causes errors if the system call as to be restarted. For SYSENTER, we have to invoke the instruction from the vdso as the return address is hardcoded. Accordingly, we can simply replace the jump in the vdso with an int $0x80 instruction and use the slower entry point for a post-restart. Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Link: http://lkml.kernel.org/r/CA%2B55aFztZ=r5wa0x26KJQxvZOaQq8s2v3u50wCyJcA-Sc4g8gQ@mail.gmail.com Cc: <stable@kernel.org>
2011-08-24m68k: fix __page_to_pfn for a const struct page argumentIan Campbell1-1/+1
Fixes fallout due to the removal of the cast in commit aa462abe8aaf ("mm: fix __page_to_pfn for a const struct page argument") Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Cc: Andrew Morton <akpm@linux-foundation.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: linux-m68k@lists.linux-m68k.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-23Revert "i2c-omap: fix static suspend vs. runtime suspend"Kevin Hilman1-29/+0
This reverts commit adf6e07922255937c8bfeea777d19502b4c9a2be. Remove system PM methods which can race with runtime PM methods. Also, as of v3.1, the PM domain level code for OMAP handles device power state transistions automatically for devices, so drivers no longer need to specifically call the bus/pm_domain methods themselves. Signed-off-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2011-08-23i2c-nomadik: Do not use _interruptible_ variant callsrinidhi kasagar1-4/+4
If there is a signal pending and wait_for_completion_interruptible_timeout exited because of the -ERESTARTSYS error we are unable to send any more i2c messages. So, deprecate this _interruptible_ variant call. Signed-off-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2011-08-23Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfsLinus Torvalds56-81/+78
* 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: fix tracing builds inside the source tree xfs: remove subdirectories xfs: don't expect xfs headers to be in subdirectories
2011-08-23Merge git://git.infradead.org/users/cbou/battery-3.1Linus Torvalds3-0/+3
* git://git.infradead.org/users/cbou/battery-3.1: s3c-adc-battery: Fix compilation error due to missing header (module.h) max8997_charger: Needs module.h max8998_charger: Needs module.h
2011-08-23Merge branch 'drm-fixes' of ↵Linus Torvalds6-15/+70
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon: Extended DDC Probing for Toshiba L300D Radeon Mobility X1100 HDMI-A Connector drm/ttm: ensure ttm for new node is bound before calling move_notify() drm/ttm: unbind ttm before destroying node in accel move cleanup drm/ttm: fix ttm_bo_add_ttm(user) failure path drm/radeon: Make vramlimit parameter actually work. drm/radeon: Explicitly print GTT/VRAM offsets on test failure. drm/radeon: Take IH ring into account for test size calculation. drm/radeon/alpha: Add Alpha support to Radeon DRM code
generated by cgit v1.2.3 (git 2.39.0) at 2025-10-02 07:36:58 +0300