diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-04 19:09:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-04 19:09:01 -0500 |
commit | fc76be434d90bcd57a0ea6b93a2e66a3fec4b664 (patch) | |
tree | 83fbf1e2bfb35b84e63f7a5a0b18d661bd080622 /block/cfq-iosched.c | |
parent | 9d82d5efafb033a761b5e6eb720f5bbba5c0813b (diff) | |
parent | 4aba098c8d64329f0c4b24d12e1dc5398dd41a75 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: Fix wrong register in proc-arm6_7.S data abort handler
ARM: 5909/1: ARM: Correct the FPSCR bits setting when raising exceptions
ARM: 5904/1: ARM: Always generate the IT instruction when compiling for Thumb-2
ARM: 5907/1: ARM: Fix the reset on the RealView PBX Development board
mx35: add a missing comma in a pad definition
mx25: make the FEC AHB clk secondary of the IPG
mx25: fix time accounting
mx25: properly initialize clocks
mx25: remove unused mx25_clocks_init() argument
i.MX25: implement secondary clocks for uarts and fec
i.MX25: Allow secondary clocks in DEFINE_CLOCK
ARM: MX3: Fixed typo in declared enum type name.
MXC: Add AUDMUXv2 register decode to debugfs
mx31ads: Provide an IRQ range to the WM835x on the 1133-EV1 module
mx31ads: Provide a name for EXPIO interrupt chip
mx31ads: Allow enable/disable of switchable supplies
Diffstat (limited to 'block/cfq-iosched.c')
0 files changed, 0 insertions, 0 deletions