27 Oct, 2011
7 commits
-
On AM335X, MMC CD & WP pins are handled directly by HSMMC ip. Currently
IP seems to fail to detect changes properly.So move the CD & WP handling to GPIO module
Signed-off-by: Hebbar, Gururaja
-
Essential conditions to indicate Version 3.00 Card (from SD3.01
spec) (SD_SPEC=2 and SD_SPEC3=1) :
(1) The card shall support CMD6
(2) The card shall support CMD8
(3) The card shall support CMD42
(4) User area capacity shall be up to 2GB (SDSC) or 32GB (SDHC)
User area capacity shall be more than or equal to 32GB and
up to 2TB (SDXC)
(5) Speed Class shall be supported (SDHC or SDXC)So even if SD card doesn't support any of the newly defined UHS-I bus speed
mode, it can advertise itself as SD3.0 cards as long as it supports all the
essential conditions of SD3.0 cards. Given this, these type of cards should
at least run in High Speed mode @50MHZ if it supports HS.This patch is from
http://www.mail-archive.com/linux-mmc@vger.kernel.org/msg09358.htmlSigned-off-by: Subhash Jadavani
Signed-off-by: Hebbar, Gururaja -
Since WP Detection is happening properly, enable support to detect
correct detectionSigned-off-by: Hebbar, Gururaja
-
Variant 2 uses Debounce Filter value for checking CD pins. Also write
protect pins have polarity inversed.This patch takes care of the same.
ToDo. Need to provide this option through platform data so that to all
platforms can use this featureSigned-off-by: Hebbar, Gururaja
-
THis patch enables the Card Insertion/Removal bits since this interrupt
is workingSigned-off-by: Hebbar, Gururaja
-
Few OMAP platform has a new Variant of HSMMC.
This patch adds support for the same.
Changes
- Add new mmc version platform data to identify new IP
- New IP has separate hw registers to detect card insertion/removal &
write protect. This patch provides supoort for the same.
- Currently code support max segs of 1
- uses different registr bit to identify dma completion errors
- New MMC IP variant defines MMC EDMA Event using HWMOD. Using regular
platform_get_resource fails for in this manner. Replace it with
platform_get_resource_bynameSigned-off-by: Hebbar, Gururaja
-
Initially, the functional clock to the mmc controller was hard coded
as 96MHz in the driver. Thus, boards that did not have a functional
clock of 96MHz coming in the controller performed sub-optimally.
This patch removes the hard coded clock rate and obtaines the clock
rate specific to the board using clk_get_rate() function.As a fallback, if the received clk rate is < hard coded value, then the
hard coded value is consideredSigned-off-by: Saxena, Parth
Signed-off-by: Hebbar, Gururaja
22 Sep, 2011
1 commit
-
* 'for-linus' of git://git.kernel.dk/linux-block:
floppy: use del_timer_sync() in init cleanup
blk-cgroup: be able to remove the record of unplugged device
block: Don't check QUEUE_FLAG_SAME_COMP in __blk_complete_request
mm: Add comment explaining task state setting in bdi_forker_thread()
mm: Cleanup clearing of BDI_pending bit in bdi_forker_thread()
block: simplify force plug flush code a little bit
block: change force plug flush call order
block: Fix queue_flag update when rq_affinity goes from 2 to 1
block: separate priority boosting from REQ_META
block: remove READ_META and WRITE_META
xen-blkback: fixed indentation and comments
xen-blkback: Don't disconnect backend until state switched to XenbusStateClosed.
01 Sep, 2011
6 commits
-
This patch fixes the problem in sdhci-s3c host driver for Samsung Soc's.
During the card identification stage the mmc core driver enumerates for
the best bus width in combination with the highest available data rate.
It starts enumerating from the highest bus width (8) to lowest width (1).In case of few MMC cards the 4-bit bus enumeration fails and tries
the 1-bit bus enumeration. When switched to 1-bit bus mode the host driver
has to clear the previous bus width setting and apply the new setting.The current patch will clear the previous bus mode and apply the new
mode setting.Signed-off-by: Girish K S
Acked-by: Jaehoon Chung
Cc:
Signed-off-by: Chris Ball -
mmc_sd_init_uhs_card function sets the driver type, current limit
and bus speed mode on card as well as on host controller side.Currently bus speed mode is set by sending CMD6 to card and
immediately setting the timing mode in host controller. But
then before initiating tuning sequence, it also tries to set
current limit by sending CMD6 to card which results in data
timeout errors in controller if bus speed mode is SDR50/SDR104 mode.So basically bus speed mode should be set only after current limit
is set in the card and immediately after setting the bus speed mode,
tuning sequence should be initiated.Signed-off-by: Subhash Jadavani
Reviewed-by: Arindam Nath
Signed-off-by: Chris Ball -
This corrects a logic error that I introduced in
"mmc: sdhi: Add write16_hook"Reported-by: Magnus Damm
Signed-off-by: Simon Horman
Signed-off-by: Chris Ball -
The default multithread workqueue can cause the same work to be executed
concurrently on a different CPUs. This isn't really suitable for clock
gating as it might already gated the clock and gating it twice results both
host->clk_old and host->ios.clock to be set to 0.To prevent this from happening we use system_nrt_wq instead.
Signed-off-by: Mika Westerberg
Reviewed-by: Linus Walleij
Tested-by: Chris Ball
Cc:
Signed-off-by: Chris Ball -
We have seen at least two different races when clock gating kicks in in a
middle of ios structure update.First one happens when ios->clock is changed outside of aggressive clock
gating framework, for example via mmc_set_clock(). The race might happen
when we run following code:mmc_set_ios():
...
if (ios->clock > 0)
mmc_set_ungated(host);Now if gating kicks in right after the condition check we end up setting
host->clk_gated to false even though we have just gated the clock. Next
time a request is started we try to ungate and restore the clock in
mmc_host_clk_hold(). However since we have host->clk_gated set to false the
original clock is not restored.This eventually will cause the host controller to hang since its clock is
disabled while we are trying to issue a request. For example on Intel
Medfield platform we see:[ 13.818610] mmc2: Timeout waiting for hardware interrupt.
[ 13.818698] sdhci: =========== REGISTER DUMP (mmc2)===========
[ 13.818753] sdhci: Sys addr: 0x00000000 | Version: 0x00008901
[ 13.818804] sdhci: Blk size: 0x00000000 | Blk cnt: 0x00000000
[ 13.818853] sdhci: Argument: 0x00000000 | Trn mode: 0x00000000
[ 13.818903] sdhci: Present: 0x1fff0000 | Host ctl: 0x00000001
[ 13.818951] sdhci: Power: 0x0000000d | Blk gap: 0x00000000
[ 13.819000] sdhci: Wake-up: 0x00000000 | Clock: 0x00000000
[ 13.819049] sdhci: Timeout: 0x00000000 | Int stat: 0x00000000
[ 13.819098] sdhci: Int enab: 0x00ff00c3 | Sig enab: 0x00ff00c3
[ 13.819147] sdhci: AC12 err: 0x00000000 | Slot int: 0x00000000
[ 13.819196] sdhci: Caps: 0x6bee32b2 | Caps_1: 0x00000000
[ 13.819245] sdhci: Cmd: 0x00000000 | Max curr: 0x00000000
[ 13.819292] sdhci: Host ctl2: 0x00000000
[ 13.819331] sdhci: ADMA Err: 0x00000000 | ADMA Ptr: 0x00000000
[ 13.819377] sdhci: ===========================================
[ 13.919605] mmc2: Reset 0x2 never completed.and it never recovers.
Second race might happen while running mmc_power_off():
static void mmc_power_off(struct mmc_host *host)
{
host->ios.clock = 0;
host->ios.vdd = 0;[ clock gating kicks in here ]
/*
* Reset ocr mask to be the highest possible voltage supported for
* this mmc host. This value will be used at next power up.
*/
host->ocr = 1 << (fls(host->ocr_avail) - 1);if (!mmc_host_is_spi(host)) {
host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
host->ios.chip_select = MMC_CS_DONTCARE;
}
host->ios.power_mode = MMC_POWER_OFF;
host->ios.bus_width = MMC_BUS_WIDTH_1;
host->ios.timing = MMC_TIMING_LEGACY;
mmc_set_ios(host);
}If the clock gating worker kicks in while we are only partially updated the
ios structure the host controller gets incomplete ios and might not work as
supposed. Again on Intel Medfield platform we get:[ 4.185349] kernel BUG at drivers/mmc/host/sdhci.c:1155!
[ 4.185422] invalid opcode: 0000 [#1] PREEMPT SMP
[ 4.185509] Modules linked in:
[ 4.185565]
[ 4.185608] Pid: 4, comm: kworker/0:0 Not tainted 3.0.0+ #240 Intel Corporation Medfield/iCDKA
[ 4.185742] EIP: 0060:[] EFLAGS: 00010083 CPU: 0
[ 4.185827] EIP is at sdhci_set_power+0x3e/0xd0
[ 4.185891] EAX: f5ff98e0 EBX: f5ff98e0 ECX: 00000000 EDX: 00000001
[ 4.185970] ESI: f5ff977c EDI: f5ff9904 EBP: f644fe98 ESP: f644fe94
[ 4.186049] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
[ 4.186125] Process kworker/0:0 (pid: 4, ti=f644e000 task=f644c0e0 task.ti=f644e000)
[ 4.186219] Stack:
[ 4.186257] f5ff98e0 f644feb0 c1365173 00000282 f5ff9460 f5ff96e0 f5ff96e0 f644feec
[ 4.186418] c1355bd8 f644c0e0 c1499c3d f5ff96e0 f644fed4 00000006 f5ff96e0 00000286
[ 4.186579] f644fedc c107922b f644feec 00000286 f5ff9460 f5ff9700 f644ff10 c135839e
[ 4.186739] Call Trace:
[ 4.186802] [] sdhci_set_ios+0x1c3/0x340
[ 4.186883] [] mmc_gate_clock+0x68/0x120
[ 4.186963] [] ? _raw_spin_unlock_irqrestore+0x4d/0x60
[ 4.187052] [] ? trace_hardirqs_on+0xb/0x10
[ 4.187134] [] mmc_host_clk_gate_delayed+0xbe/0x130
[ 4.187219] [] ? process_one_work+0xf9/0x5b0
[ 4.187300] [] mmc_host_clk_gate_work+0xd/0x10
[ 4.187379] [] process_one_work+0x172/0x5b0
[ 4.187457] [] ? process_one_work+0xf9/0x5b0
[ 4.187538] [] ? mmc_host_clk_gate_delayed+0x130/0x130
[ 4.187625] [] worker_thread+0x118/0x330
[ 4.187700] [] ? preempt_schedule+0x2e/0x50
[ 4.187779] [] ? rescuer_thread+0x1f0/0x1f0
[ 4.187857] [] kthread+0x74/0x80
[ 4.187931] [] ? __init_kthread_worker+0x60/0x60
[ 4.188015] [] kernel_thread_helper+0x6/0xd
[ 4.188079] Code: 81 fa 00 00 04 00 0f 84 a7 00 00 00 7f 21 81 fa 80 00 00 00 0f 84 92 00 00 00 81 fa 00 00 0
[ 4.188780] EIP: [] sdhci_set_power+0x3e/0xd0 SS:ESP 0068:f644fe94
[ 4.188898] ---[ end trace a7b23eecc71777e4 ]---This BUG() comes from the fact that ios.power_mode was still in previous
value (MMC_POWER_ON) and ios.vdd was set to zero.We prevent these by inhibiting the clock gating while we update the ios
structure.Both problems can be reproduced by simply running the device in a reboot
loop.Signed-off-by: Mika Westerberg
Reviewed-by: Linus Walleij
Tested-by: Chris Ball
Cc:
Signed-off-by: Chris Ball -
As per suggestion by Linus Walleij:
> If you think the names of the functions are confusing then
> you may rename them, say like this:
>
> mmc_host_clk_ungate() -> mmc_host_clk_hold()
> mmc_host_clk_gate() -> mmc_host_clk_release()
>
> Which would make the usecases more clear(This is CC'd to stable@ because the next two patches, which fix
observable races, depend on it.)Signed-off-by: Mika Westerberg
Reviewed-by: Linus Walleij
Cc:
Signed-off-by: Chris Ball
29 Aug, 2011
1 commit
-
There are the following warnings and errorx when compiling the driver.
The patch adds the missing inclusion of linux/module.h to fix them.drivers/mmc/host/sdhci-esdhc-imx.c:563:12: error: ‘THIS_MODULE’ undeclared here (not in a function)
[..]Signed-off-by: Shawn Guo
Signed-off-by: Chris Ball
23 Aug, 2011
1 commit
-
Add a new REQ_PRIO to let requests preempt others in the cfq I/O schedule,
and lave REQ_META purely for marking requests as metadata in blktrace.All existing callers of REQ_META except for XFS are updated to also
set REQ_PRIO for now.Signed-off-by: Christoph Hellwig
Reviewed-by: Namhyung Kim
Signed-off-by: Jens Axboe
14 Aug, 2011
15 commits
-
Host driver can't get a hint of DDR mode through ios->ddr flag anymore.
ios->timing is currently used to inform DDR mode as a substitute.
And capability of MMC_CAP_MMC_HIGHSPEED is added for DDR support.Signed-off-by: Seungwon Jeon
Acked-by: Will Newton
Signed-off-by: Chris Ball -
Signed-off-by: Jaehoon Chung
Signed-off-by: Kyungmin Park
Signed-off-by: Chris Ball -
When timeout_clk is calculated the host->clock could be zero.
So, instead of host->clock the calculation now uses mmc->f_max.Signed-off-by: Andy Shevchenko
Cc: Mark Brown
Signed-off-by: Chris Ball -
This moves the calculation below the assignment of mmc->f_max, which
we need for calculating timeout_clk in the next patch in this series.Signed-off-by: Andy Shevchenko
Signed-off-by: Chris Ball -
Sometimes host->clock could be zero which is a legal situation. This
patch checks host->clock before usage as a denominator when timeout is
calculated. A similar patch is applied for mmc core (see commit e9b8684,
"mmc: fix division by zero in MMC core").Without this patch, the execution of the sdhci_calc_timeout could end up
with a backtrace:[ 4.014319] divide error: 0000 [#1] PREEMPT SMP
[ 4.014352] Modules linked in: g_ether
[ 4.014376]
[ 4.014393] Pid: 33, comm: kworker/u:2 Not tainted 3.0.0+ #646
[ 4.014421] EIP: 0060:[] EFLAGS: 00010046 CPU: 1
[ 4.014449] EIP is at sdhci_calc_timeout+0x2e/0x100
[ 4.014468] EAX: 00000000 EBX: f5930fc8 ECX: 00000000 EDX: 00000000
[ 4.014488] ESI: f5291de8 EDI: f5291db8 EBP: f5291c6c ESP: f5291c50
[ 4.014508] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
[ 4.014529] Process kworker/u:2 (pid: 33, ti=f5290000 task=f53065a0 task.ti=f5290000)
[ 4.014546] Stack:
[ 4.014557] 00000082 c1054fdd f5291c78 04000000 f5930fc8 f5291de8 f5291db8 f5291cac
[ 4.014611] c12fab7c c107a98b f5291c88 c13b6d3f f593109c f5882000 f5291cac c1054fdd
[ 4.014663] 00000000 00000000 f5882000 00000082 f5930fc8 f5291db8 0000000a f5291ccc
[ 4.014716] Call Trace:
[ 4.014743] [] ? mod_timer+0x11d/0x380
[ 4.014770] [] sdhci_prepare_data+0x2c/0x3a0
[ 4.014798] [] ? trace_hardirqs_off+0xb/0x10
[ 4.014827] [] ? _raw_spin_unlock_irqrestore+0x2f/0x60
[ 4.014854] [] ? mod_timer+0x11d/0x380
[ 4.014880] [] sdhci_send_command+0xdb/0x210
[ 4.014906] [] sdhci_request+0xc3/0x150
[ 4.014932] [] mmc_start_request+0xda/0x200
[ 4.014960] [] ? __raw_spin_lock_init+0x32/0x60
[ 4.014989] [] ? __init_waitqueue_head+0x35/0x50
[ 4.015015] [] mmc_wait_for_req+0x7b/0x90
[ 4.015045] [] mmc_send_cxd_data+0xf7/0x130
[ 4.015076] [] ? mmc_erase+0x140/0x140
[ 4.015102] [] mmc_send_ext_csd+0x1d/0x20
[ 4.015125] [] mmc_get_ext_csd+0x70/0x140
[ 4.015151] [] mmc_compare_ext_csds+0x28/0x190
[ 4.015176] [] mmc_init_card+0x24f/0x650
[ 4.015201] [] ? _raw_spin_unlock_irqrestore+0x4d/0x60
[ 4.015226] [] ? trace_hardirqs_on_caller+0x11c/0x160
[ 4.015255] [] mmc_attach_mmc+0xa4/0x190
[ 4.015282] [] mmc_rescan+0x210/0x240
[ 4.015311] [] process_one_work+0x176/0x550
[ 4.015336] [] ? process_one_work+0xfa/0x550
[ 4.015360] [] ? mmc_init_erase+0x140/0x140
[ 4.015385] [] worker_thread+0x12a/0x2c0
[ 4.015410] [] ? manage_workers.clone.18+0x100/0x100
[ 4.015437] [] kthread+0x74/0x80
[ 4.015463] [] ? __init_kthread_worker+0x60/0x60
[ 4.015490] [] kernel_thread_helper+0x6/0xd
[ 4.015507] Code: 57 89 d7 56 53 89 c3 83 ec 10 8b 40 04 8b 72 28 f6 c4 10 89 45 f0 0f 85 91 00 00 00 85 f6 0f 84 c1 00 00 00 8b 4e 04 31 d2 89 c8 73 58 ba d3 4d 62 10 89 c1 8b 06 f7 e2 c1 ea 06 01 d1 f7 45
[ 4.015829] EIP: [] sdhci_calc_timeout+0x2e/0x100 SS:ESP 0068:f5291c50Reported-by: Alexander Shishkin
Signed-off-by: Andy Shevchenko
Signed-off-by: Chris Ball -
This reverts commit 4b01681c7764, which introduced a new potential
divide by zero in the process of fixing one. The subsequent commits
attempt to fix the issue properly.Signed-off-by: Chris Ball
-
Fix below compile warning:
CC drivers/mmc/host/tmio_mmc.o
drivers/mmc/host/tmio_mmc.c: In function 'tmio_mmc_suspend':
drivers/mmc/host/tmio_mmc.c:30: warning: unused variable 'mmc'
drivers/mmc/host/tmio_mmc.c: In function 'tmio_mmc_resume':
drivers/mmc/host/tmio_mmc.c:45: warning: unused variable 'mmc'Signed-off-by: Axel Lin
Acked-by: Guennadi Liakhovetski
Signed-off-by: Chris Ball -
Apply a workaround for the imx eSDHC controller to avoid missing
card interrupts. This makes SDIO work.Signed-off-by: Tony Lin
Signed-off-by: Chris Ball -
A header change has removed an implicit inclusion of module.h, breaking
the build due to the use of THIS_MODULE. Fix that.Signed-off-by: Mark Brown
Signed-off-by: Chris Ball -
The mask used inside this macro was assuming Buffer_Size1's [BS1's]
width to be 14 bits, it is actually 13 bits. Modify masks used in
IDMAC_SET_BUFFER1_SIZE such that they use only 13 bits instead of
current 14.Signed-off-by: Shashidhar Hiremath
Acked-by: Will Newton
Signed-off-by: Chris Ball -
The eMMC v4.5 Spec is released now:
EXT_CSD_REV Extended CSD Revision
255-7 Reserved
6 Revision 1.6 (for MMC v4.5)
5 Revision 1.5 (for MMV v4.41)
...Signed-off-by: Kyungmin Park
Signed-off-by: Chris Ball -
During card removal and inserting cycle the test file in the debugfs could be
stalled until the host driver removes it. Let's keep the file in the linked
list and destroy it when card is removed.Signed-off-by: Andy Shevchenko
Acked-by: Per Forlin
Signed-off-by: Chris Ball -
Samsung SoCs need to set BROKEN_ADMA_ZEROLEN_DESC.
(If ADMA operation is more than 65535, maybe set by zero.)Signed-off-by: Jaehoon Chung
Signed-off-by: Kyungmin Park
Signed-off-by: Chris Ball -
Enable the quirk.
(Best used in conjunction with patch downgrading ADMA to SDMA when
transfer is not aligned.)Signed-off-by: Philip Rakity
Acked-by: Zhangfei Gao
Signed-off-by: Chris Ball -
Currently, the retuning timer for retuning mode 1 will be deleted in
function sdhci_tasklet_finish after a mmc request done, which will make
retuning timing never trigger again. This patch fixed this problem.Signed-off-by: Aaron Lu
Reviewed-by: Philip Rakity
Signed-off-by: Chris Ball
27 Jul, 2011
6 commits
-
The patch adds device tree probe support for sdhci-esdhc-imx driver.
Signed-off-by: Shawn Guo
Cc: Wolfram Sang
Cc: Chris Ball
Cc: Grant Likely
Acked-by: Grant Likely
Acked-by: Chris Ball -
Neither platform based nor dt based device needs to pass the parent
to sdhci_alloc_host. There is no difference between platform and dt
on this point.The patch makes the change to pass device itself than its parent to
sdhci_alloc_host for dt case too. Otherwise the probe function of
sdhci based drivers which is shared between platform and dt will
fail on dt case.Signed-off-by: Shawn Guo
Cc: Chris Ball
Acked-by: Grant Likely
Acked-by: Chris Ball -
The patch removes all the uses of cpu_is_mx(). Instead, it utilizes
platform_device_id to distinguish the esdhc differences among SoCs.Signed-off-by: Shawn Guo
Cc: Wolfram Sang
Cc: Chris Ball
Acked-by: Grant Likely
Acked-by: Chris Ball -
The patch copies platform data into pltfm_imx_data and reference
the data there than platform data after probe.This work is inspired by Grant Likely and Troy Kisky.
Signed-off-by: Shawn Guo
Cc: Troy Kisky
Cc: Grant Likely
Cc: Wolfram Sang
Cc: Chris Ball
Acked-by: Grant Likely
Acked-by: Chris Ball -
The patch extends card_detect and write_protect support to get mx5
family and more scenarios supported. The changes include:* Turn platform_data from optional to mandatory
* Add cd_types and wp_types into platform_data to cover more use
cases
* Remove the use of flag ESDHC_FLAG_GPIO_FOR_CD
* Adjust some machine codes to adopt the platform_data changes
* Work around the issue that software reset will get card detection
circuit stop workingWith this patch, card_detect and write_protect gets supported on
mx5 based platforms.Signed-off-by: Shawn Guo
Cc: Chris Ball
Acked-by: Wolfram Sang
Tested-by: Arnaud Patard
Acked-by: Chris Ball -
Fix build issue caused by undefined struct scatterlist in
drivers/mmc/host/tmio_mmc.c.Signed-off-by: Rafael J. Wysocki
Signed-off-by: Linus Torvalds
26 Jul, 2011
3 commits
-
* Merge akpm patch series: (122 commits)
drivers/connector/cn_proc.c: remove unused local
Documentation/SubmitChecklist: add RCU debug config options
reiserfs: use hweight_long()
reiserfs: use proper little-endian bitops
pnpacpi: register disabled resources
drivers/rtc/rtc-tegra.c: properly initialize spinlock
drivers/rtc/rtc-twl.c: check return value of twl_rtc_write_u8() in twl_rtc_set_time()
drivers/rtc: add support for Qualcomm PMIC8xxx RTC
drivers/rtc/rtc-s3c.c: support clock gating
drivers/rtc/rtc-mpc5121.c: add support for RTC on MPC5200
init: skip calibration delay if previously done
misc/eeprom: add eeprom access driver for digsy_mtc board
misc/eeprom: add driver for microwire 93xx46 EEPROMs
checkpatch.pl: update $logFunctions
checkpatch: make utf-8 test --strict
checkpatch.pl: add ability to ignore various messages
checkpatch: add a "prefer __aligned" check
checkpatch: validate signature styles and To: and Cc: lines
checkpatch: add __rcu as a sparse modifier
checkpatch: suggest using min_t or max_t
...Did this as a merge because of (trivial) conflicts in
- Documentation/feature-removal-schedule.txt
- arch/xtensa/include/asm/uaccess.h
that were just easier to fix up in the merge than in the patch series. -
It is not necessary to share the same notifier.h.
Signed-off-by: WANG Cong
Cc: David Miller
Acked-by: "Rafael J. Wysocki"
Cc: Greg KH
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
fs: Merge split strings
treewide: fix potentially dangerous trailing ';' in #defined values/expressions
uwb: Fix misspelling of neighbourhood in comment
net, netfilter: Remove redundant goto in ebt_ulog_packet
trivial: don't touch files that are removed in the staging tree
lib/vsprintf: replace link to Draft by final RFC number
doc: Kconfig: `to be' -> `be'
doc: Kconfig: Typo: square -> squared
doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
drivers/net: static should be at beginning of declaration
drivers/media: static should be at beginning of declaration
drivers/i2c: static should be at beginning of declaration
XTENSA: static should be at beginning of declaration
SH: static should be at beginning of declaration
MIPS: static should be at beginning of declaration
ARM: static should be at beginning of declaration
rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
Update my e-mail address
PCIe ASPM: forcedly -> forcibly
gma500: push through device driver tree
...Fix up trivial conflicts:
- arch/arm/mach-ep93xx/dma-m2p.c (deleted)
- drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
- drivers/net/r8169.c (just context changes)
