diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-18 00:05:26 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-18 00:05:26 +0100 |
commit | 55dac3a5553b13891f0ae4bbd11920619b5436d4 (patch) | |
tree | 88431185f839d44a92dae9a58adba30d9be65aea /kernel/cgroup.c | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | i2c-s3c2410: fix check for being in suspend. (diff) | |
download | linux-55dac3a5553b13891f0ae4bbd11920619b5436d4.tar.xz linux-55dac3a5553b13891f0ae4bbd11920619b5436d4.zip |
Merge branch 'i2c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
* 'i2c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux:
i2c-s3c2410: fix check for being in suspend.
i2c-cpm: Detect and report NAK right away instead of timing out
Diffstat (limited to 'kernel/cgroup.c')
0 files changed, 0 insertions, 0 deletions