diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-15 12:49:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-15 12:49:16 -0400 |
commit | 264780c29041a147f5cff5dda64d03373e24b972 (patch) | |
tree | 4d74502d311792550f052e54a5e93ded5de5283e /drivers/misc/atmel_pwm.c | |
parent | 8fd01d6cfbf75465d84a4e533ed70c5f57b3ff51 (diff) | |
parent | 47526903feb52f4c26a6350370bdf74e337fcdb1 (diff) |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
ubd: fix incorrect sector handling during request restart
ps3disk: passing wrong variable to bvec_kunmap_irq()
Diffstat (limited to 'drivers/misc/atmel_pwm.c')
0 files changed, 0 insertions, 0 deletions