summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net: macb: fix build break with !CONFIG_OFOlof Johansson2011-12-211-0/+1
* Merge branch 'at91/macb' into next/driversArnd Bergmann2011-12-168-18/+129
|\
| * net/at91_ether: use gpio_is_valid for phy IRQ lineNicolas Ferre2011-12-161-10/+13
| * ARM: at91/net: add macb ethernet controller in 9g45/9g20 DTNicolas Ferre2011-12-164-0/+24
| * net/macb: add DT support for Cadence macb/gem driverJean-Christophe PLAGNIOL-VILLARD2011-12-163-8/+92
* | Merge branch 'omap/hsmmc' into next/driversOlof Johansson2011-12-136-24/+86
|\ \
| * \ Merge branch 'hsmmc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/...Olof Johansson2011-12-136-24/+86
| |\ \
| | * | ARM: OMAP: hsmmc: Add support for AM3517EVM base-board MMC slotVaibhav Hiremath2011-12-091-0/+22
| | * | ARM: OMAP: hsmmc: Support for AM3517 MMC1 voltagesAbhilash K V2011-12-091-1/+9
| | * | ARM: OMAP: hsmmc: Add support for non-OMAP pinsThomas Weber2011-12-091-2/+4
| | * | ARM: OMAP: hsmmc: Add support for MMC 2 setup for AM35xIgor Grinberg2011-12-091-12/+30
| | * | ARM: OMAP: hsmmc: board-sdp4430: declare support for MMC_PM_KEEP_POWEREliad Peller2011-12-091-0/+1
| | * | ARM: OMAP: hsmmc: add pm_caps fieldEliad Peller2011-12-084-0/+5
| | * | omap_hsmmc: consider MMC_PM_KEEP_POWER on suspend/resumeEliad Peller2011-12-081-9/+15
| |/ /
* | | Merge branch 'drivers/pxa-gpio' into next/driversArnd Bergmann2011-12-082-0/+2
|\ \ \
| * | | ARM: pxa: fix build error for GPIO_bit()Haojian Zhuang2011-12-081-0/+1
| * | | ARM: pxa: fix the build error because of missing gpio-pxa.hHaojian Zhuang2011-12-081-0/+1
* | | | Merge branch 'mxs/saif' into next/driversArnd Bergmann2011-12-06682-5076/+7073
|\ \ \ \
| * | | | ARM: mx28evk: set a initial clock rate for saifDong Aisheng2011-12-021-0/+9
| * | | | ARM: mx28evk: add platform data for saifDong Aisheng2011-12-024-6/+24
| * | | | ARM: mxs: add saif clkmux functionsDong Aisheng2011-12-023-0/+51
| * | | | ASoC: mxs-saif: remove function in platform_dataDong Aisheng2011-12-022-13/+11
| | |/ / | |/| |
| * | | Linux 3.2-rc4v3.2-rc4Linus Torvalds2011-12-011-1/+1
| * | | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2011-12-0131-536/+995
| |\ \ \
| | * | | ocfs2: avoid unaligned access to dqc_bitmapAkinobu Mita2011-12-012-5/+52
| | * | | ocfs2: Use filemap_write_and_wait() instead of write_inode_now()Jan Kara2011-11-171-1/+1
| | * | | ocfs2: honor O_(D)SYNC flag in fallocateMark Fasheh2011-11-171-0/+3
| | * | | ocfs2: Add a missing journal credit in ocfs2_link_credits() -v2Xiaowei.Hu2011-11-171-2/+3
| | * | | ocfs2: send correct UUID to cleancache initializationDan Magenheimer2011-11-171-1/+1
| | * | | ocfs2: Commit transactions in error cases -v2Wengang Wang2011-11-173-6/+9
| | * | | ocfs2: make direntry invalid when deleting itWengang Wang2011-11-171-2/+1
| | * | | fs/ocfs2/dlm/dlmlock.c: free kmem_cache_zalloc'd data using kmem_cache_freeJulia Lawall2011-11-171-1/+1
| | * | | Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 in...Joel Becker2011-08-214577-119139/+261695
| | |\ \ \
| | | * | | ocfs2: Implement llseek()Sunil Mushran2011-07-253-2/+151
| | | * | | ocfs2: Fix ocfs2_page_mkwrite()Wengang Wang2011-07-242-37/+67
| | | * | | ocfs2: Add comment about orphan scanningSunil Mushran2011-07-241-0/+14
| | | * | | ocfs2: Clean up messages in the fsSunil Mushran2011-07-244-14/+22
| | | * | | ocfs2/cluster: Cluster up now includes network connections tooSunil Mushran2011-07-242-13/+61
| | | * | | ocfs2/cluster: Add new function o2net_fill_node_map()Sunil Mushran2011-07-243-33/+90
| | | * | | ocfs2/cluster: Fix output in file elapsed_time_in_msSunil Mushran2011-07-241-3/+6
| | | * | | ocfs2/dlm: dlmlock_remote() needs to account for remasterySunil Mushran2011-07-241-10/+8
| | | * | | ocfs2/dlm: Take inflight reference count for remotely mastered resources tooSunil Mushran2011-07-243-39/+32
| | | * | | ocfs2/dlm: Cleanup dlm_wait_for_node_death() and dlm_wait_for_node_recovery()Sunil Mushran2011-07-242-26/+24
| | | * | | ocfs2/dlm: Trace insert/remove of resource to/from hashSunil Mushran2011-07-243-11/+15
| | | * | | ocfs2/dlm: Clean up refmap helpersSunil Mushran2011-07-243-79/+66
| | | * | | ocfs2/dlm: Cleanup up dlm_finish_local_lockres_recovery()Sunil Mushran2011-07-241-32/+25
| | | * | | ocfs2: Clean up messages in stack_o2cb.cSunil Mushran2011-07-241-2/+2
| | | * | | ocfs2/dlm: Clean up messages in o2dlmSunil Mushran2011-07-245-70/+71
| | | * | | ocfs2/cluster: Clean up messages in o2netSunil Mushran2011-07-241-66/+53
| | | * | | ocfs2/cluster: Abort heartbeat start on hard-ro devicesSunil Mushran2011-07-241-69/+116