| commit | be1fd94fd698e9dfa2676f688d4e9b034e0d4b9e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri May 12 12:14:52 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri May 12 12:14:52 2006 -0700 |
| tree | fc19e966f53d2bc7202fd4565d999595515ce50b | |
| parent | 0d38eddab9ce6de3a9d6d583043dfa97b6bc0d3b [diff] | |
| parent | 95563d343fec8d3e2f667c95230ac4ab7674b757 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: [PATCH] scx200_acb: Fix for the CS5535 errata [PATCH] scx200_acb: Fix resource name use after free [PATCH] scx200_acb: Fix return on init error