diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-26 03:19:23 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-26 03:19:23 (GMT) |
| commit | ede847c406054ba2a1ef2d165d3fd9f8e2b8d1bc (patch) | |
| tree | f2533f1c9e569249b579e9d2615ba4b772eedd70 /block/ioctl.c | |
| parent | 9eed28679282238210ad5e80bb91df30fec6d7db (diff) | |
| parent | 64271c4d909a15bc588f053a739db2e6df336d7d (diff) | |
| download | linux-fsl-qoriq-ede847c406054ba2a1ef2d165d3fd9f8e2b8d1bc.tar.xz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3902/1: Enable GPIO81-84 on PXA255
[ARM] Comment out missing configuration symbols
[ARM] 3898/1: corgi_bl fix module loading
[ARM] 3897/1: corgi_bl fix module compiling
[ARM] Fix breakage in 7281c248f797723f66244b7ecef204620f664648
Diffstat (limited to 'block/ioctl.c')
0 files changed, 0 insertions, 0 deletions